From bcf1ffa9f5c87632ee2e650c1de04e91d8fdc7dd 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:17 +0800 Subject: [PATCH] feat(Core/Scripts): Optimize MovementHandlerScript need#18672 (#18701) * Add files via upload * Add files via upload --- .../ScriptDefines/MovementHandlerScript.cpp | 16 +++++++++------- .../ScriptDefines/MovementHandlerScript.h | 8 +++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp index 2f79dd957..c10f04014 100644 --- a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.cpp @@ -21,16 +21,18 @@ void ScriptMgr::OnPlayerMove(Player* player, MovementInfo movementInfo, uint32 opcode) { - ExecuteScript([&](MovementHandlerScript* script) - { - script->OnPlayerMove(player, movementInfo, opcode); - }); + CALL_ENABLED_HOOKS(MovementHandlerScript, MOVEMENTHOOK_ON_PLAYER_MOVE, script->OnPlayerMove(player, movementInfo, opcode)); } -MovementHandlerScript::MovementHandlerScript(const char* name) : - ScriptObject(name) +MovementHandlerScript::MovementHandlerScript(const char* name, std::vector enabledHooks) : + ScriptObject(name, MOVEMENTHOOK_END) { - ScriptRegistry::AddScript(this); + // If empty - enable all available hooks. + if (enabledHooks.empty()) + for (uint16 i = 0; i < MOVEMENTHOOK_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/MovementHandlerScript.h b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h index cc0fdc7cf..0893cc207 100644 --- a/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h +++ b/src/server/game/Scripting/ScriptDefines/MovementHandlerScript.h @@ -21,10 +21,16 @@ #include "Object.h" #include "ScriptObject.h" +enum MovementHook +{ + MOVEMENTHOOK_ON_PLAYER_MOVE, + MOVEMENTHOOK_END +}; + class MovementHandlerScript : public ScriptObject { protected: - MovementHandlerScript(const char* name); + MovementHandlerScript(const char* name, std::vector enabledHooks = std::vector()); public: //Called whenever a player moves