From b9e3c0be80ecf6dd3a5dcc6c50a6a00503b73fe7 Mon Sep 17 00:00:00 2001 From: Niam5 Date: Fri, 13 Oct 2023 20:27:00 -0500 Subject: [PATCH] Add Group OnMemberAccept hook -Update Eluna submodule Co-Authored-By: Foereaper <2131987+foereaper@users.noreply.github.com> --- src/game/Groups/GroupHandler.cpp | 8 ++++++++ src/game/LuaEngine | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/game/Groups/GroupHandler.cpp b/src/game/Groups/GroupHandler.cpp index 59e6fbb990..5065282755 100644 --- a/src/game/Groups/GroupHandler.cpp +++ b/src/game/Groups/GroupHandler.cpp @@ -30,6 +30,9 @@ #include "Social/SocialMgr.h" #include "Util/Util.h" #include "Anticheat/Anticheat.hpp" +#ifdef BUILD_ELUNA +#include "LuaEngine/LuaEngine.h" +#endif /* differeces from off: -you can uninvite yourself - is is useful @@ -208,6 +211,11 @@ void WorldSession::HandleGroupAcceptOpcode(WorldPacket& /*recv_data*/) return; } +#ifdef BUILD_ELUNA + if (!sEluna->OnMemberAccept(group, GetPlayer())) + return; +#endif + Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid()); // forming a new group, create it diff --git a/src/game/LuaEngine b/src/game/LuaEngine index 752db0d85e..1edc007459 160000 --- a/src/game/LuaEngine +++ b/src/game/LuaEngine @@ -1 +1 @@ -Subproject commit 752db0d85e016e8b948f51a07454a5824a97f8ec +Subproject commit 1edc007459b70dc0f9a06e07da3cc340aaa6f349