From 33592f93cf0010c63eb4896fc95be24397655c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=B9=BF?= <18535853+PkllonG@users.noreply.github.com> Date: Fri, 12 Apr 2024 04:09:47 +0800 Subject: [PATCH] feat(Core/Scripts): Optimize ArenaTeamScript need#18672 (#18699) Add files via upload --- .../ScriptDefines/ArenaTeamScript.cpp | 36 +++++++------------ .../Scripting/ScriptDefines/ArenaTeamScript.h | 12 ++++++- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp index 7ddf58f9f..8abad7dd5 100644 --- a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.cpp @@ -21,48 +21,38 @@ void ScriptMgr::OnGetSlotByType(const uint32 type, uint8& slot) { - ExecuteScript([&](ArenaTeamScript* script) - { - script->OnGetSlotByType(type, slot); - }); + CALL_ENABLED_HOOKS(ArenaTeamScript, ARENATEAMHOOK_ON_GET_SLOT_BY_TYPE, script->OnGetSlotByType(type, slot)); } void ScriptMgr::OnGetArenaPoints(ArenaTeam* at, float& points) { - ExecuteScript([&](ArenaTeamScript* script) - { - script->OnGetArenaPoints(at, points); - }); + CALL_ENABLED_HOOKS(ArenaTeamScript, ARENATEAMHOOK_ON_GET_ARENA_POINTS, script->OnGetArenaPoints(at, points)); } void ScriptMgr::OnArenaTypeIDToQueueID(const BattlegroundTypeId bgTypeId, const uint8 arenaType, uint32& queueTypeID) { - ExecuteScript([&](ArenaTeamScript* script) - { - script->OnTypeIDToQueueID(bgTypeId, arenaType, queueTypeID); - }); + CALL_ENABLED_HOOKS(ArenaTeamScript, ARENATEAMHOOK_ON_TYPEID_TO_QUEUEID, script->OnTypeIDToQueueID(bgTypeId, arenaType, queueTypeID)); } void ScriptMgr::OnArenaQueueIdToArenaType(const BattlegroundQueueTypeId bgQueueTypeId, uint8& ArenaType) { - ExecuteScript([&](ArenaTeamScript* script) - { - script->OnQueueIdToArenaType(bgQueueTypeId, ArenaType); - }); + CALL_ENABLED_HOOKS(ArenaTeamScript, ARENATEAMHOOK_ON_QUEUEID_TO_ARENA_TYPE, script->OnQueueIdToArenaType(bgQueueTypeId, ArenaType)); } void ScriptMgr::OnSetArenaMaxPlayersPerTeam(const uint8 arenaType, uint32& maxPlayerPerTeam) { - ExecuteScript([&](ArenaTeamScript* script) - { - script->OnSetArenaMaxPlayersPerTeam(arenaType, maxPlayerPerTeam); - }); + CALL_ENABLED_HOOKS(ArenaTeamScript, ARENATEAMHOOK_ON_SET_ARENA_MAX_PLAYERS_PER_TEAM, script->OnSetArenaMaxPlayersPerTeam(arenaType, maxPlayerPerTeam)); } -ArenaTeamScript::ArenaTeamScript(const char* name) - : ScriptObject(name) +ArenaTeamScript::ArenaTeamScript(const char* name, std::vector enabledHooks) + : ScriptObject(name, ARENATEAMHOOK_END) { - ScriptRegistry::AddScript(this); + // If empty - enable all available hooks. + if (enabledHooks.empty()) + for (uint16 i = 0; i < ARENATEAMHOOK_END; i++) + enabledHooks.emplace_back(i); + + ScriptRegistry::AddScript(this, std::move(enabledHooks)); } template class AC_GAME_API ScriptRegistry; diff --git a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h index 256d5c510..319576b40 100644 --- a/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h +++ b/src/server/game/Scripting/ScriptDefines/ArenaTeamScript.h @@ -21,10 +21,20 @@ #include "Battleground.h" #include "ScriptObject.h" +enum ArenaTeamHook +{ + ARENATEAMHOOK_ON_GET_SLOT_BY_TYPE, + ARENATEAMHOOK_ON_GET_ARENA_POINTS, + ARENATEAMHOOK_ON_TYPEID_TO_QUEUEID, + ARENATEAMHOOK_ON_QUEUEID_TO_ARENA_TYPE, + ARENATEAMHOOK_ON_SET_ARENA_MAX_PLAYERS_PER_TEAM, + ARENATEAMHOOK_END +}; + class ArenaTeamScript : public ScriptObject { protected: - ArenaTeamScript(const char* name); + ArenaTeamScript(const char* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; };