nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-30 17:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Scripts): Optimize GroupScript (#18713)

Browse Source 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update GroupScript.h
This commit is contained in:
天鹿
2024-04-12 21:56:31 +08:00
committed by GitHub
parent e2a07cf9b7
commit a2c867fcf2
3 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/DungeonFinding/LFGScripts.cpp
View File

@@ -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
})
{ {
} }

53
src/server/game/Scripting/ScriptDefines/GroupScript.cpp
View File

@@ -23,79 +23,56 @@ void ScriptMgr::OnGroupAddMember(Group* group, ObjectGuid guid)
{ {
ASSERT(group); ASSERT(group);
ExecuteScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_ADD_MEMBER, script->OnAddMember(group, guid));
{
script->OnAddMember(group, guid);
});
} }
void ScriptMgr::OnGroupInviteMember(Group* group, ObjectGuid guid) void ScriptMgr::OnGroupInviteMember(Group* group, ObjectGuid guid)
{ {
ASSERT(group); ASSERT(group);
ExecuteScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_INVITE_MEMBER, script->OnInviteMember(group, guid));
{
script->OnInviteMember(group, guid);
});
} }
void ScriptMgr::OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, const char* reason) void ScriptMgr::OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, const char* reason)
{ {
ASSERT(group); ASSERT(group);
ExecuteScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_REMOVE_MEMBER, script->OnRemoveMember(group, guid, method, kicker, reason));
{
script->OnRemoveMember(group, guid, method, kicker, reason);
});
} }
void ScriptMgr::OnGroupChangeLeader(Group* group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid) void ScriptMgr::OnGroupChangeLeader(Group* group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid)
{ {
ASSERT(group); ASSERT(group);
ExecuteScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_CHANGE_LEADER, script->OnChangeLeader(group, newLeaderGuid, oldLeaderGuid));
{
script->OnChangeLeader(group, newLeaderGuid, oldLeaderGuid);
});
} }
void ScriptMgr::OnGroupDisband(Group* group) void ScriptMgr::OnGroupDisband(Group* group)
{ {
ASSERT(group); ASSERT(group);
ExecuteScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_DISBAND, script->OnDisband(group));
{
script->OnDisband(group);
});
} }
bool ScriptMgr::CanGroupJoinBattlegroundQueue(Group const* group, Player* member, Battleground const* bgTemplate, uint32 MinPlayerCount, bool isRated, uint32 arenaSlot) bool ScriptMgr::CanGroupJoinBattlegroundQueue(Group const* group, Player* member, Battleground const* bgTemplate, uint32 MinPlayerCount, bool isRated, uint32 arenaSlot)
{ {
auto ret = IsValidBoolScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_BOOLEAN_HOOKS(GroupScript, GROUPHOOK_CAN_GROUP_JOIN_BATTLEGROUND_QUEUE, !script->CanGroupJoinBattlegroundQueue(group, member, bgTemplate, MinPlayerCount, isRated, arenaSlot));
{
return !script->CanGroupJoinBattlegroundQueue(group, member, bgTemplate, MinPlayerCount, isRated, arenaSlot);
});
if (ret && *ret)
{
return false;
}
return true;
} }
void ScriptMgr::OnCreate(Group* group, Player* leader) void ScriptMgr::OnCreate(Group* group, Player* leader)
{ {
ExecuteScript<GroupScript>([&](GroupScript* script) CALL_ENABLED_HOOKS(GroupScript, GROUPHOOK_ON_CREATE, script->OnCreate(group, leader));
{
script->OnCreate(group, leader);
});
} }
GroupScript::GroupScript(const char* name) GroupScript::GroupScript(const char* name, std::vector<uint16> enabledHooks)
: ScriptObject(name) : ScriptObject(name, GROUPHOOK_END)
{ {
ScriptRegistry<GroupScript>::AddScript(this); // If empty - enable all available hooks.
if (enabledHooks.empty())
for (uint16 i = 0; i < GROUPHOOK_END; ++i)
enabledHooks.emplace_back(i);
ScriptRegistry<GroupScript>::AddScript(this, std::move(enabledHooks));
} }
template class AC_GAME_API ScriptRegistry<GroupScript>; template class AC_GAME_API ScriptRegistry<GroupScript>;

15
src/server/game/Scripting/ScriptDefines/GroupScript.h
View File

@@ -20,13 +20,26 @@
#include "ObjectGuid.h" #include "ObjectGuid.h"
#include "ScriptObject.h" #include "ScriptObject.h"
#include <vector>
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; enum RemoveMethod : uint8;
class GroupScript : public ScriptObject class GroupScript : public ScriptObject
{ {
protected: protected:
GroupScript(const char* name); GroupScript(const char* name, std::vector<uint16> enabledHooks = std::vector<uint16>());
public: public:
[[nodiscard]] bool IsDatabaseBound() const override { return false; } [[nodiscard]] bool IsDatabaseBound() const override { return false; }