diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index 8a34a1478..36fd9bfb3 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -140,7 +140,15 @@ namespace lfg } } - LFGGroupScript::LFGGroupScript() : GroupScript("LFGGroupScript") + LFGGroupScript::LFGGroupScript() : + GroupScript("LFGGroupScript", + { + GROUPHOOK_ON_ADD_MEMBER, + GROUPHOOK_ON_REMOVE_MEMBER, + GROUPHOOK_ON_DISBAND, + GROUPHOOK_ON_CHANGE_LEADER, + GROUPHOOK_ON_INVITE_MEMBER + }) { } diff --git a/src/server/game/Scripting/ScriptDefines/GroupScript.cpp b/src/server/game/Scripting/ScriptDefines/GroupScript.cpp index 8e1cc75e3..aed5e68ff 100644 --- a/src/server/game/Scripting/ScriptDefines/GroupScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GroupScript.cpp @@ -23,79 +23,56 @@ void ScriptMgr::OnGroupAddMember(Group* group, ObjectGuid guid) { ASSERT(group); - ExecuteScript([&](GroupScript* script) - { - script->OnAddMember(group, guid); - }); + CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_ADD_MEMBER, script->OnAddMember(group, guid)); } void ScriptMgr::OnGroupInviteMember(Group* group, ObjectGuid guid) { ASSERT(group); - ExecuteScript([&](GroupScript* script) - { - script->OnInviteMember(group, guid); - }); + CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_INVITE_MEMBER, script->OnInviteMember(group, guid)); } void ScriptMgr::OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, const char* reason) { ASSERT(group); - ExecuteScript([&](GroupScript* script) - { - script->OnRemoveMember(group, guid, method, kicker, reason); - }); + CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_REMOVE_MEMBER, script->OnRemoveMember(group, guid, method, kicker, reason)); } void ScriptMgr::OnGroupChangeLeader(Group* group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid) { ASSERT(group); - ExecuteScript([&](GroupScript* script) - { - script->OnChangeLeader(group, newLeaderGuid, oldLeaderGuid); - }); + CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_CHANGE_LEADER, script->OnChangeLeader(group, newLeaderGuid, oldLeaderGuid)); } void ScriptMgr::OnGroupDisband(Group* group) { ASSERT(group); - ExecuteScript([&](GroupScript* script) - { - script->OnDisband(group); - }); + CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_DISBAND, script->OnDisband(group)); } bool ScriptMgr::CanGroupJoinBattlegroundQueue(Group const* group, Player* member, Battleground const* bgTemplate, uint32 MinPlayerCount, bool isRated, uint32 arenaSlot) { - auto ret = IsValidBoolScript([&](GroupScript* script) - { - return !script->CanGroupJoinBattlegroundQueue(group, member, bgTemplate, MinPlayerCount, isRated, arenaSlot); - }); - - if (ret && *ret) - { - return false; - } - - return true; + CALL_ENABLED_BOOLEAN_HOOKS(GroupScript, GROUPHOOK_CAN_GROUP_JOIN_BATTLEGROUND_QUEUE, !script->CanGroupJoinBattlegroundQueue(group, member, bgTemplate, MinPlayerCount, isRated, arenaSlot)); } void ScriptMgr::OnCreate(Group* group, Player* leader) { - ExecuteScript([&](GroupScript* script) - { - script->OnCreate(group, leader); - }); + CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_CREATE, script->OnCreate(group, leader)); } -GroupScript::GroupScript(const char* name) - : ScriptObject(name) +GroupScript::GroupScript(const char* name, std::vector enabledHooks) + : ScriptObject(name, GROUPHOOK_END) { - ScriptRegistry::AddScript(this); + // If empty - enable all available hooks. + if (enabledHooks.empty()) + for (uint16 i = 0; i < GROUPHOOK_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/GroupScript.h b/src/server/game/Scripting/ScriptDefines/GroupScript.h index 603deb0a1..96f396418 100644 --- a/src/server/game/Scripting/ScriptDefines/GroupScript.h +++ b/src/server/game/Scripting/ScriptDefines/GroupScript.h @@ -20,13 +20,26 @@ #include "ObjectGuid.h" #include "ScriptObject.h" +#include + +enum GroupHook +{ + GROUPHOOK_ON_ADD_MEMBER, + GROUPHOOK_ON_INVITE_MEMBER, + GROUPHOOK_ON_REMOVE_MEMBER, + GROUPHOOK_ON_CHANGE_LEADER, + GROUPHOOK_ON_DISBAND, + GROUPHOOK_CAN_GROUP_JOIN_BATTLEGROUND_QUEUE, + GROUPHOOK_ON_CREATE, + GROUPHOOK_END +}; enum RemoveMethod : uint8; class GroupScript : public ScriptObject { protected: - GroupScript(const char* name); + GroupScript(const char* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; }