From 4f7fa3085b64286e2c2cea5638ca8f9fd8515722 Mon Sep 17 00:00:00 2001
From: Niam5 <ebakkedahl@gmail.com>
Date: Sun, 30 Jul 2023 19:09:43 -0500
Subject: [PATCH] Update for new Eluna structure and libraries

-Update Eluna submodule
---
 .gitmodules             |  1 -
 src/game/CMakeLists.txt | 23 +++++++++++++++++++++++
 src/game/LuaEngine      |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index be8af9194..fdac2411b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "src/game/LuaEngine"]
 	path = src/game/LuaEngine
 	url = https://github.com/Niam5/Eluna.git
-	branch = cmangos-cata
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 07df778fd..dca1e19e5 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -45,6 +45,28 @@ if(NOT BUILD_ELUNA)
       endif ()
   endforeach()
 else()
+# Exclude other cores
+set (EXCLUDE_DIR "LuaEngine/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/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/")
+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()
 add_definitions(-DBUILD_ELUNA -DCMANGOS -DCATA)
 endif()
 
@@ -100,6 +122,7 @@ set(ADDITIONAL_INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
   ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
   ${CMAKE_CURRENT_SOURCE_DIR}/PlayerBot
+  ${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos
   ${CMAKE_SOURCE_DIR}/dep/lualib
   ${CMAKE_BINARY_DIR}
 )
diff --git a/src/game/LuaEngine b/src/game/LuaEngine
index c4e45194e..d74c15817 160000
--- a/src/game/LuaEngine
+++ b/src/game/LuaEngine
@@ -1 +1 @@
-Subproject commit c4e45194eeba810e86647e91ce7a86ed6e370713
+Subproject commit d74c15817f556ae96340b5bc7f0996f13d8b6580