From 247a7f67637f3f7f3d692795eddb52d663b12b8a Mon Sep 17 00:00:00 2001 From: manstfu <33990720+manstfu@users.noreply.github.com> Date: Fri, 14 Feb 2025 14:22:39 +0100 Subject: [PATCH] chore: update to support WorldSessionMgr PR 21400 (#258) --- src/LuaEngine/ElunaIncludes.h | 2 ++ src/LuaEngine/LuaEngine.cpp | 2 +- src/LuaEngine/methods/GlobalMethods.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/LuaEngine/ElunaIncludes.h b/src/LuaEngine/ElunaIncludes.h index 38b73dc..d0a66fb 100644 --- a/src/LuaEngine/ElunaIncludes.h +++ b/src/LuaEngine/ElunaIncludes.h @@ -52,6 +52,7 @@ #include "Bag.h" #include "Vehicle.h" #include "ArenaTeam.h" +#include "WorldSessionMgr.h" typedef Opcodes OpcodesList; @@ -62,6 +63,7 @@ typedef Opcodes OpcodesList; #define CORE_NAME "AzerothCore" #define CORE_VERSION (GitRevision::GetFullVersion()) +#define eWorldSessionMgr (sWorldSessionMgr) #define eWorld (sWorld) #define eMapMgr (sMapMgr) #define eConfigMgr (sConfigMgr) diff --git a/src/LuaEngine/LuaEngine.cpp b/src/LuaEngine/LuaEngine.cpp index f7baa2f..466e91a 100644 --- a/src/LuaEngine/LuaEngine.cpp +++ b/src/LuaEngine/LuaEngine.cpp @@ -128,7 +128,7 @@ void Eluna::_ReloadEluna() ASSERT(IsInitialized()); if (eConfigMgr->GetOption("Eluna.PlayerAnnounceReload", false)) - eWorld->SendServerMessage(SERVER_MSG_STRING, "Reloading Eluna..."); + eWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, "Reloading Eluna..."); else ChatHandler(nullptr).SendGMText(SERVER_MSG_STRING, "Reloading Eluna..."); diff --git a/src/LuaEngine/methods/GlobalMethods.h b/src/LuaEngine/methods/GlobalMethods.h index e4c2f3c..f902f0d 100644 --- a/src/LuaEngine/methods/GlobalMethods.h +++ b/src/LuaEngine/methods/GlobalMethods.h @@ -282,7 +282,7 @@ namespace LuaGlobalFunctions */ int GetPlayerCount(lua_State* L) { - Eluna::Push(L, eWorld->GetActiveSessionCount()); + Eluna::Push(L, eWorldSessionMgr->GetActiveSessionCount()); return 1; } @@ -1278,7 +1278,7 @@ namespace LuaGlobalFunctions int SendWorldMessage(lua_State* L) { const char* message = Eluna::CHECKVAL(L, 1); - eWorld->SendServerMessage(SERVER_MSG_STRING, message); + eWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, message); return 0; }