Skip to content

Commit

Permalink
Merge pull request #2 from Foereaper/master
Browse files Browse the repository at this point in the history 
Update Eluna submodule
  • Loading branch information
@Niam5
Niam5 authored Jul 21, 2024
2 parents e62bf48 + d72428a commit 5e04575
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/game/LuaEngine
Submodule LuaEngine updated 41 files
+2 −2 ElunaCompat.cpp
+2 −2 ElunaCompat.h
+45 −5 ElunaConfig.cpp
+5 −0 ElunaConfig.h
+46 −162 ElunaCreatureAI.h
+1 −1 ElunaEventMgr.cpp
+2 −2 ElunaEventMgr.h
+46 −72 ElunaIncludes.h
+4 −4 ElunaInstanceAI.cpp
+8 −11 ElunaInstanceAI.h
+90 −71 ElunaLoader.cpp
+34 −22 ElunaLoader.h
+7 −7 ElunaTemplate.h
+3 −6 ElunaUtility.cpp
+20 −36 ElunaUtility.h
+26 −14 LuaEngine.cpp
+60 −92 LuaEngine.h
+3 −5 LuaFunctions.cpp
+0 −4 hooks/BattleGroundHooks.cpp
+1 −1 hooks/CreatureHooks.cpp
+1 −3 hooks/GameObjectHooks.cpp
+11 −11 hooks/GossipHooks.cpp
+2 −2 hooks/GuildHooks.cpp
+2 −2 hooks/ItemHooks.cpp
+2 −2 hooks/PacketHooks.cpp
+1 −1 hooks/PlayerHooks.cpp
+7 −46 hooks/ServerHooks.cpp
+2 −4 hooks/VehicleHooks.cpp
+0 −4 methods/TrinityCore/BattleGroundMethods.h
+0 −12 methods/TrinityCore/CreatureMethods.h
+0 −6 methods/TrinityCore/GameObjectMethods.h
+3 −66 methods/TrinityCore/GlobalMethods.h
+0 −13 methods/TrinityCore/GroupMethods.h
+0 −8 methods/TrinityCore/GuildMethods.h
+1 −107 methods/TrinityCore/ItemMethods.h
+0 −10 methods/TrinityCore/MapMethods.h
+3 −117 methods/TrinityCore/PlayerMethods.h
+0 −4 methods/TrinityCore/QuestMethods.h
+0 −4 methods/TrinityCore/UnitMethods.h
+0 −4 methods/TrinityCore/VehicleMethods.h
+2 −30 methods/TrinityCore/WorldObjectMethods.h
2 changes: 1 addition & 1 deletion src/game/Maps/Map.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
// lua state begins uninitialized
eluna = nullptr;

if (sElunaConfig->IsElunaEnabled() && !sElunaConfig->IsElunaCompatibilityMode() && sElunaLoader->ShouldMapLoadEluna(id))
if (sElunaConfig->IsElunaEnabled() && !sElunaConfig->IsElunaCompatibilityMode() && sElunaConfig->ShouldMapLoadEluna(id))
eluna = new Eluna(this);

if (Eluna* e = GetEluna())
Expand Down

0 comments on commit 5e04575

Please sign in to comment.