From 7c989c92f6ca278e645066337930be6f9c5fea50 Mon Sep 17 00:00:00 2001
From: UltraNix <ultranix@gmail.com>
Date: Sun, 18 Jul 2021 16:13:35 +0200
Subject: [PATCH 1/2] Fixed build for AzerothCore after recent changes.

---
 MapMethods.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/MapMethods.h b/MapMethods.h
index e065cbf..6c6260e 100644
--- a/MapMethods.h
+++ b/MapMethods.h
@@ -190,12 +190,10 @@ namespace LuaMap
         float x = Eluna::CHECKVAL<float>(L, 2);
         float y = Eluna::CHECKVAL<float>(L, 3);
         float z = Eluna::CHECKVAL<float>(L, 4);
-#if defined TRINITY
+#if defined TRINITY || defined AZEROTHCORE
         float phasemask = Eluna::CHECKVAL<uint32>(L, 5, PHASEMASK_NORMAL);
 
         Eluna::Push(L, map->GetAreaId(phasemask, x, y, z));
-#elif defined AZEROTHCORE
-        Eluna::Push(L, map->GetAreaId(x, y, z));
 #else
         Eluna::Push(L, map->GetTerrain()->GetAreaId(x, y, z));
 #endif

From 33f9b264dbc1a8ace380a4cf0108b43e1fc74c5d Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Wed, 18 Aug 2021 00:09:00 +0300
Subject: [PATCH 2/2] Fix TC build

---
 ElunaCreatureAI.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ElunaCreatureAI.h b/ElunaCreatureAI.h
index 877c936..3778afd 100644
--- a/ElunaCreatureAI.h
+++ b/ElunaCreatureAI.h
@@ -90,16 +90,20 @@ struct ElunaCreatureAI : ScriptedAI
 #endif
 
     // Called at any Damage from any attacker (before damage apply)
-#if AZEROTHCORE
+#if defined AZEROTHCORE
     void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask) override
+#elif defined TRINITY
+    void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* spellInfo) override
 #else
     void DamageTaken(Unit* attacker, uint32& damage) override
 #endif
     {
         if (!sEluna->DamageTaken(me, attacker, damage))
         {
-#if AZEROTHCORE
+#if defined AZEROTHCORE
             ScriptedAI::DamageTaken(attacker, damage, damagetype, damageSchoolMask);
+#elif defined TRINITY
+            ScriptedAI::DamageTaken(attacker, damage, damageType, spellInfo);
 #else
             ScriptedAI::DamageTaken(attacker, damage);
 #endif