Merge branch 'master' into fixx

azerothcore · Jul 28, 2024 · f9b1b10 · f9b1b10
2 parents 4a63bc2 + b39869a
commit f9b1b10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/ElunaLuaEngine_SC.cpp b/src/ElunaLuaEngine_SC.cpp
@@ -237,9 +237,10 @@ class Eluna_AllMapScript : public AllMapScript
 public:
     Eluna_AllMapScript() : AllMapScript("Eluna_AllMapScript") { }
 
-    void OnBeforeCreateInstanceScript(InstanceMap* instanceMap, InstanceScript* instanceData, bool /*load*/, std::string /*data*/, uint32 /*completedEncounterMask*/) override
+    void OnBeforeCreateInstanceScript(InstanceMap* instanceMap, InstanceScript** instanceData, bool /*load*/, std::string /*data*/, uint32 /*completedEncounterMask*/) override
     {
-        instanceData = sEluna->GetInstanceData(instanceMap);
+        if (instanceData)
+            *instanceData = sEluna->GetInstanceData(instanceMap);
     }
 
     void OnDestroyInstance(MapInstanced* /*mapInstanced*/, Map* map) override

diff --git a/src/LuaEngine/GlobalMethods.h b/src/LuaEngine/GlobalMethods.h
@@ -2159,8 +2159,6 @@ namespace LuaGlobalFunctions
         const int BAN_CHARACTER = 1;
         const int BAN_IP = 2;
 
-        BanMode mode = BanMode::BAN_ACCOUNT;
-
         switch (banMode)
         {
             case BAN_ACCOUNT:
@@ -2171,26 +2169,20 @@ namespace LuaGlobalFunctions
                 if (!AccountMgr::normalizeString(nameOrIP))
                     return luaL_argerror(L, 2, "invalid account name");
 #endif
-                mode = BanMode::BAN_ACCOUNT;
                 break;
             case BAN_CHARACTER:
                 if (!normalizePlayerName(nameOrIP))
                     return luaL_argerror(L, 2, "invalid character name");
-                mode = BanMode::BAN_CHARACTER;
                 break;
             case BAN_IP:
                 if (!IsIPAddress(nameOrIP.c_str()))
                     return luaL_argerror(L, 2, "invalid ip");
-                mode = BanMode::BAN_IP;
                 break;
             default:
                 return luaL_argerror(L, 1, "unknown banmode");
         }
 
         BanReturn result;
-#ifndef AZEROTHCORE
-        result = eWorld->BanAccount(mode, nameOrIP, duration, reason, whoBanned);
-#else
         switch (banMode)
         {
             case BAN_ACCOUNT:
@@ -2203,7 +2195,6 @@ namespace LuaGlobalFunctions
                 result = sBan->BanIP(nameOrIP, std::to_string(duration) + "s", reason, whoBanned);
             break;
         }
-#endif
 
         switch (result)
         {