From a9f7745202148c2f7264b5630e412b44845e6c60 Mon Sep 17 00:00:00 2001
From: Niam5 <ebakkedahl@gmail.com>
Date: Sun, 7 Apr 2024 22:37:37 -0700
Subject: [PATCH] Update Eluna

---
 src/game/CMakeLists.txt    | 16 ++++++++++------
 src/game/LuaEngine         |  2 +-
 src/mangosd/CMakeLists.txt |  3 +++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index d1fc985a834..48cf2ebdade 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -51,28 +51,28 @@ if(NOT BUILD_ELUNA)
   endforeach()
 else()
 # Exclude other cores
-set (EXCLUDE_DIR "LuaEngine/Mangos/")
+set (EXCLUDE_DIR "LuaEngine/methods/Mangos/")
 foreach (TMP_PATH ${LIBRARY_SRCS})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
         list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH})
     endif ()
 endforeach()
-set (EXCLUDE_DIR "LuaEngine/VMangos/")
+set (EXCLUDE_DIR "LuaEngine/methods/VMangos/")
 foreach (TMP_PATH ${LIBRARY_SRCS})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
         list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH})
     endif ()
 endforeach()
-set (EXCLUDE_DIR "LuaEngine/TrinityCore/")
+set (EXCLUDE_DIR "LuaEngine/methods/TrinityCore/")
 foreach (TMP_PATH ${LIBRARY_SRCS})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
         list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH})
     endif ()
 endforeach()
-set (EXCLUDE_DIR "LuaEngine/AzerothCore/")
+set (EXCLUDE_DIR "LuaEngine/methods/AzerothCore/")
 foreach (TMP_PATH ${LIBRARY_SRCS})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@@ -150,7 +150,9 @@ if(NOT BUILD_PLAYERBOTS)
     ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
     ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
     ${CMAKE_CURRENT_SOURCE_DIR}/PlayerBot
-    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/methods/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/hooks
     ${CMAKE_SOURCE_DIR}/dep/lualib
     ${CMAKE_BINARY_DIR}
   )
@@ -161,7 +163,9 @@ else()
     ${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot
     ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
     ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
-    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/methods/CMangos
+    ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/hooks
     ${CMAKE_SOURCE_DIR}/dep/lualib
     ${CMAKE_BINARY_DIR}
   )
diff --git a/src/game/LuaEngine b/src/game/LuaEngine
index 28d2ef23ff9..11f42ba2f0f 160000
--- a/src/game/LuaEngine
+++ b/src/game/LuaEngine
@@ -1 +1 @@
-Subproject commit 28d2ef23ff9fd333473bb7e79c650533c6a869cc
+Subproject commit 11f42ba2f0ff4789bd877eeee15dd4d4b7e57838
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index d2ea04c942f..03f90ff3208 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -160,6 +160,9 @@ endif()
 
 # Define BUILD_ELUNA if needed
 if (BUILD_ELUNA)
+  include_directories(
+  ${CMAKE_SOURCE_DIR}/src/game/LuaEngine/hooks
+  )
   add_definitions(-DBUILD_ELUNA -DTBC -DCMANGOS)
   install(FILES ${CMAKE_SOURCE_DIR}/contrib/lua_scripts/masterscript.lua DESTINATION ${BIN_DIR}/lua_scripts)
   install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/game/LuaEngine/extensions DESTINATION ${BIN_DIR}/lua_scripts)