From ac117b33c2d0c0b78dd7364b77a975597345d57c Mon Sep 17 00:00:00 2001
From: Niam5 <ebakkedahl@gmail.com>
Date: Tue, 27 Jun 2023 17:41:14 -0700
Subject: [PATCH] Fix MaNGOS Three build

-Add MaNGOSThree to README
---
 Mangos/GlobalMethods.h | 2 +-
 Mangos/PlayerMethods.h | 6 +-----
 Mangos/UnitMethods.h   | 6 +++++-
 README.md              | 3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Mangos/GlobalMethods.h b/Mangos/GlobalMethods.h
index 673a3dc935..f3d47a72d4 100644
--- a/Mangos/GlobalMethods.h
+++ b/Mangos/GlobalMethods.h
@@ -1976,7 +1976,7 @@ namespace LuaGlobalFunctions
 
         auto const itemlist = items->m_items;
         for (auto itr = itemlist.begin(); itr != itemlist.end(); ++itr)
-#if defined(CATA) || defined(MISTS)
+#if defined(MISTS) || (defined MANGOS && defined CATA)
             eObjectMgr->RemoveVendorItem(entry, (*itr)->item, 1);
 #else
 #ifdef TRINITY
diff --git a/Mangos/PlayerMethods.h b/Mangos/PlayerMethods.h
index 22bcbd073f..5af5217578 100644
--- a/Mangos/PlayerMethods.h
+++ b/Mangos/PlayerMethods.h
@@ -2748,15 +2748,11 @@ namespace LuaPlayer
     {
         bool no_cost = Eluna::CHECKVAL<bool>(E->L, 2, true);
 
-#ifdef CATA
-        player->ResetTalents(no_cost);
-#else
-#ifdef TRINITY
+#if defined TRINITY
         player->ResetTalents(no_cost);
 #else
         player->resetTalents(no_cost);
 #endif
-#endif
 #if (!defined(TBC) && !defined(CLASSIC))
         player->SendTalentsInfoData(false);
 #endif
diff --git a/Mangos/UnitMethods.h b/Mangos/UnitMethods.h
index df9d739863..fe589fefff 100644
--- a/Mangos/UnitMethods.h
+++ b/Mangos/UnitMethods.h
@@ -2340,7 +2340,7 @@ namespace LuaUnit
         float maxHeight = Eluna::CHECKVAL<float>(E->L, 6);
         uint32 id = Eluna::CHECKVAL<uint32>(E->L, 7, 0);
 
-#if (defined(CMANGOS) || defined(MANGOS)) && defined(WOTLK)
+#if (defined(CMANGOS) || defined(MANGOS)) && (defined(WOTLK) || defined(CATA))
         unit->GetMotionMaster()->MoveJump(x, y, z, zSpeed, maxHeight, id);
 #else
         Position pos(x, y, z);
@@ -2647,7 +2647,11 @@ namespace LuaUnit
 
         for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
         {
+#if defined(MANGOS) && defined (CATA)
+            uint8 eff = SpellEffectIndex(i);
+#else
             uint8 eff = spellEntry->Effect[i];
+#endif
 #ifndef CMANGOS
             if (eff >= TOTAL_SPELL_EFFECTS)
 #else
diff --git a/README.md b/README.md
index 8cd1a97a85..683bd7d68a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,8 @@ Core sources and forks with required modifications for Eluna:
 
 [Official MaNGOS Zero with Eluna](https://github.com/mangoszero/server)  
 [Official MaNGOS One with Eluna](https://github.com/mangosone/server)  
-[Official MaNGOS Two with Eluna](https://github.com/mangostwo/server)
+[Official MaNGOS Two with Eluna](https://github.com/mangostwo/server)  
+[Official MaNGOS Three with Eluna](https://github.com/mangosthree/server)  
 
 [Eluna cMaNGOS Classic](https://github.com/Niam5/Eluna-CMaNGOS-Classic) - maintained by [Niam5](https://github.com/Niam5)  
 [Eluna cMaNGOS TBC](https://github.com/Niam5/Eluna-CMaNGOS-TBC) - maintained by [Niam5](https://github.com/Niam5)