From e750046936a34d3af9ac74c45c0584be05e31e43 Mon Sep 17 00:00:00 2001
From: Niam5 <ebakkedahl@gmail.com>
Date: Thu, 8 Aug 2024 16:06:35 -0700
Subject: [PATCH] Cata updates

---
 ElunaIncludes.h                 |  3 ++-
 methods/CMangos/PlayerMethods.h | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index d285d25cb5..43aa7d82e1 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -93,7 +93,6 @@
 #include "Spells/SpellAuras.h"
 #include "Spells/SpellMgr.h"
 #include "Tools/Language.h"
-#include "AI/BaseAI/UnitAI.h"
 #include "Server/SQLStorages.h"
 #if ELUNA_EXPANSION > CLASSIC
 #include "Arena/ArenaTeam.h"
@@ -103,6 +102,8 @@
 #endif
 #if ELUNA_EXPANSION >= CATA
 #include "AI/BaseAI/AggressorAI.h"
+#else
+#include "AI/BaseAI/UnitAI.h"
 #endif
 #endif
 
diff --git a/methods/CMangos/PlayerMethods.h b/methods/CMangos/PlayerMethods.h
index 24b913aaaf..03a66c5cbd 100644
--- a/methods/CMangos/PlayerMethods.h
+++ b/methods/CMangos/PlayerMethods.h
@@ -737,7 +737,7 @@ namespace LuaPlayer
     }
 #endif
 
-#if ELUNA_EXPANSION >= TBC
+#if ELUNA_EXPANSION >= TBC && ELUNA_EXPANSION <= WOTLK
     /**
      * Returns the [Player]s current amount of Arena Points
      *
@@ -1847,7 +1847,7 @@ namespace LuaPlayer
         return 0;
     }
 
-#if ELUNA_EXPANSION >= TBC
+#if ELUNA_EXPANSION >= TBC && ELUNA_EXPANSION <= WOTLK
     /**
      * Sets the [Player]s Arena Points to the amount specified
      *
@@ -2033,7 +2033,7 @@ namespace LuaPlayer
         return 0;
     }
 
-#if ELUNA_EXPANSION >= TBC
+#if ELUNA_EXPANSION >= TBC && ELUNA_EXPANSION <= WOTLK
     /**
      * Adds or detracts from the [Player]s current Arena Points
      *
@@ -3798,7 +3798,7 @@ namespace LuaPlayer
         { "GetCorpse", &LuaPlayer::GetCorpse },
         { "GetGossipTextId", &LuaPlayer::GetGossipTextId },
         { "GetQuestRewardStatus", &LuaPlayer::GetQuestRewardStatus },
-#if ELUNA_EXPANSION >= TBC
+#if ELUNA_EXPANSION >= TBC && ELUNA_EXPANSION <= WOTLK
         { "GetArenaPoints", &LuaPlayer::GetArenaPoints },
         { "GetHonorPoints", &LuaPlayer::GetHonorPoints },
 #else
@@ -3850,11 +3850,14 @@ namespace LuaPlayer
 #if ELUNA_EXPANSION >= TBC
         { "SetKnownTitle", &LuaPlayer::SetKnownTitle },
         { "UnsetKnownTitle", &LuaPlayer::UnsetKnownTitle },
-        { "SetArenaPoints", &LuaPlayer::SetArenaPoints },
-        { "SetHonorPoints", &LuaPlayer::SetHonorPoints },
 #else
         { "SetKnownTitle", METHOD_REG_NONE },
         { "UnsetKnownTitle", METHOD_REG_NONE },
+#endif
+#if ELUNA_EXPANSION >= TBC && ELUNA_EXPANSION <= WOTLK
+        { "SetArenaPoints", &LuaPlayer::SetArenaPoints },
+        { "SetHonorPoints", &LuaPlayer::SetHonorPoints },
+#else
         { "SetArenaPoints", METHOD_REG_NONE },
         { "SetHonorPoints", METHOD_REG_NONE },
 #endif
@@ -4009,10 +4012,13 @@ namespace LuaPlayer
         { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
 #if ELUNA_EXPANSION >= TBC
         { "RemoveArenaSpellCooldowns", &LuaPlayer::RemoveArenaSpellCooldowns },
+#else
+        { "RemoveArenaSpellCooldowns", METHOD_REG_NONE },
+#endif
+#if ELUNA_EXPANSION >= TBC && ELUNA_EXPANSION <= WOTLK
         { "ModifyHonorPoints", &LuaPlayer::ModifyHonorPoints },
         { "ModifyArenaPoints", &LuaPlayer::ModifyArenaPoints },
 #else
-        { "RemoveArenaSpellCooldowns", METHOD_REG_NONE },
         { "ModifyHonorPoints", METHOD_REG_NONE },
         { "ModifyArenaPoints", METHOD_REG_NONE },
 #endif