feat(Core/Scripts): Optimize ArenaScript need#18672 (#18700)

Add files via upload

src/server/game/Scripting/ScriptDefines/ArenaScript.cpp

@@ -21,46 +21,28 @@
 
 bool ScriptMgr::CanAddMember(ArenaTeam* team, ObjectGuid PlayerGuid)
 {
-    auto ret = IsValidBoolScript<ArenaScript>([&](ArenaScript* script)
+    CALL_ENABLED_BOOLEAN_HOOKS(ArenaScript, ARENAHOOK_CAN_ADD_MEMBER, !script->CanAddMember(team, PlayerGuid));
-    {
-        return !script->CanAddMember(team, PlayerGuid);
-    });
-
-    if (ret && *ret)
-    {
-        return false;
-    }
-
-    return true;
 }
 
 void ScriptMgr::OnGetPoints(ArenaTeam* team, uint32 memberRating, float& points)
 {
-    ExecuteScript<ArenaScript>([&](ArenaScript* script)
+    CALL_ENABLED_HOOKS(ArenaScript, ARENAHOOK_ON_GET_POINTS, script->OnGetPoints(team, memberRating, points));
-    {
-        script->OnGetPoints(team, memberRating, points);
-    });
 }
 
 bool ScriptMgr::CanSaveToDB(ArenaTeam* team)
 {
-    auto ret = IsValidBoolScript<ArenaScript>([&](ArenaScript* script)
+    CALL_ENABLED_BOOLEAN_HOOKS(ArenaScript, ARENAHOOK_CAN_SAVE_TO_DB, !script->CanSaveToDB(team));
-    {
-        return !script->CanSaveToDB(team);
-    });
-
-    if (ret && *ret)
-    {
-        return false;
-    }
-
-    return true;
 }
 
-ArenaScript::ArenaScript(const char* name)
+ArenaScript::ArenaScript(const char* name, std::vector<uint16> enabledHooks)
-    : ScriptObject(name)
+    : ScriptObject(name, ARENAHOOK_END)
 {
-    ScriptRegistry<ArenaScript>::AddScript(this);
+    // If empty - enable all available hooks.
+    if (enabledHooks.empty())
+        for (uint16 i = 0; i < ARENAHOOK_END; i++)
+            enabledHooks.emplace_back(i);
+
+    ScriptRegistry<ArenaScript>::AddScript(this, std::move(enabledHooks));
 }
 
 template class AC_GAME_API ScriptRegistry<ArenaScript>;

src/server/game/Scripting/ScriptDefines/ArenaScript.h

@@ -21,11 +21,19 @@
 #include "ObjectGuid.h"
 #include "ScriptObject.h"
 
+enum ArenaHook
+{
+    ARENAHOOK_CAN_ADD_MEMBER,
+    ARENAHOOK_ON_GET_POINTS,
+    ARENAHOOK_CAN_SAVE_TO_DB,
+    ARENAHOOK_END
+};
+
 class ArenaScript : public ScriptObject
 {
 protected:
 
-    ArenaScript(const char* name);
+    ArenaScript(const char* name, std::vector<uint16> enabledHooks = std::vector<uint16>());
 
 public: