From a8d0ba6757d52ce3d7eb1ab80a7bc9a82598dbae Mon Sep 17 00:00:00 2001
From: Patman64 <patman256@yahoo.com>
Date: Sat, 2 Aug 2014 02:17:54 -0400
Subject: [PATCH 1/4] Fix compiling error due to Ban global method.

---
 GlobalMethods.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GlobalMethods.h b/GlobalMethods.h
index ffebcfa..0c21177 100644
--- a/GlobalMethods.h
+++ b/GlobalMethods.h
@@ -951,7 +951,7 @@ namespace LuaGlobalFunctions
         std::string nameOrIP = Eluna::CHECKVAL<std::string>(L, 2);
         uint32 duration = Eluna::CHECKVAL<uint32>(L, 3);
         const char* reason = Eluna::CHECKVAL<const char*>(L, 4);
-        const char* whoBanned = Eluna::CHECKOBJ<Player>(L, 5);
+        const char* whoBanned = Eluna::CHECKVAL<const char*>(L, 5);
 
         switch (banMode)
         {

From 4acbb496f3ef00b5fcee21a433e904c34d650449 Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Mon, 4 Aug 2014 20:23:45 +0300
Subject: [PATCH 2/4] Eluna Try to decide with the cases already!

---
 UnitMethods.h | 46 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/UnitMethods.h b/UnitMethods.h
index 6a84495..6645279 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -555,12 +555,27 @@ namespace LuaUnit
 
     Powers PowerSelectorHelper(lua_State* L, Unit* unit, int powerType = -1)
     {
-#if (!defined(TRINITY) && defined(WOTLK))
+#ifdef TRINITY
+        if (powerType == -1)
+            return unit->getPowerType();
+#endif
+#ifdef MANGOS
+#if (defined(WOTLK))
         if (powerType == -1)
             return unit->GetPowerType();
 #else
         if (powerType == -1)
             return unit->getPowerType();
+#endif
+#endif
+#ifdef CMANGOS
+#if (defined(WOTLK) || defined(TBC))
+        if (powerType == -1)
+            return unit->GetPowerType();
+#else
+        if (powerType == -1)
+            return unit->getPowerType();
+#endif
 #endif
 
         if (powerType < 0 || powerType >= int(MAX_POWERS))
@@ -603,10 +618,22 @@ namespace LuaUnit
 
     int GetPowerType(lua_State* L, Unit* unit)
     {
-#if (!defined(TRINITY) && defined(WOTLK))
+#ifdef TRINITY
+        Eluna::Push(L, unit->getPowerType());
+#endif
+#ifdef MANGOS
+#if (defined(WOTLK))
         Eluna::Push(L, unit->GetPowerType());
 #else
         Eluna::Push(L, unit->getPowerType());
+#endif
+#endif
+#ifdef CMANGOS
+#if (defined(WOTLK) || defined(TBC))
+        Eluna::Push(L, unit->GetPowerType());
+#else
+        Eluna::Push(L, unit->getPowerType());
+#endif
 #endif
         return 1;
     }
@@ -919,10 +946,23 @@ namespace LuaUnit
         uint32 type = Eluna::CHECKVAL<uint32>(L, 2);
         if (type >= int(MAX_POWERS))
             return luaL_argerror(L, 2, "valid Powers expected");
-#if (!defined(TRINITY) && defined(WOTLK))
+
+#ifdef TRINITY
+        unit->setPowerType((Powers)type);
+#endif
+#ifdef MANGOS
+#if (defined(WOTLK))
         unit->SetPowerType((Powers)type);
 #else
         unit->setPowerType((Powers)type);
+#endif
+#endif
+#ifdef CMANGOS
+#if (defined(WOTLK) || defined(TBC))
+        unit->SetPowerType((Powers)type);
+#else
+        unit->setPowerType((Powers)type);
+#endif
 #endif
         return 0;
     }

From bbc0a4d68d9b0f1a4354e9d346414a56327c8fbe Mon Sep 17 00:00:00 2001
From: Salja <salja8840@gmail.com>
Date: Fri, 8 Aug 2014 21:51:38 +0200
Subject: [PATCH 3/4] Update for CMaNGOS Classic PowerType Core change

Signed-off-by: Salja <salja8840@gmail.com>
---
 UnitMethods.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/UnitMethods.h b/UnitMethods.h
index 6645279..1c4c83e 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -569,13 +569,8 @@ namespace LuaUnit
 #endif
 #endif
 #ifdef CMANGOS
-#if (defined(WOTLK) || defined(TBC))
         if (powerType == -1)
             return unit->GetPowerType();
-#else
-        if (powerType == -1)
-            return unit->getPowerType();
-#endif
 #endif
 
         if (powerType < 0 || powerType >= int(MAX_POWERS))
@@ -629,11 +624,7 @@ namespace LuaUnit
 #endif
 #endif
 #ifdef CMANGOS
-#if (defined(WOTLK) || defined(TBC))
         Eluna::Push(L, unit->GetPowerType());
-#else
-        Eluna::Push(L, unit->getPowerType());
-#endif
 #endif
         return 1;
     }
@@ -958,11 +949,7 @@ namespace LuaUnit
 #endif
 #endif
 #ifdef CMANGOS
-#if (defined(WOTLK) || defined(TBC))
         unit->SetPowerType((Powers)type);
-#else
-        unit->setPowerType((Powers)type);
-#endif
 #endif
         return 0;
     }

From a46e0074b9a8f73079ed2ff1f5125ec7f79114d6 Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Sat, 9 Aug 2014 00:07:41 +0300
Subject: [PATCH 4/4] Fix mangos zero rel20 build for new changes

---
 UnitMethods.h | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/UnitMethods.h b/UnitMethods.h
index 1c4c83e..8588fe6 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -558,17 +558,7 @@ namespace LuaUnit
 #ifdef TRINITY
         if (powerType == -1)
             return unit->getPowerType();
-#endif
-#ifdef MANGOS
-#if (defined(WOTLK))
-        if (powerType == -1)
-            return unit->GetPowerType();
 #else
-        if (powerType == -1)
-            return unit->getPowerType();
-#endif
-#endif
-#ifdef CMANGOS
         if (powerType == -1)
             return unit->GetPowerType();
 #endif
@@ -615,15 +605,7 @@ namespace LuaUnit
     {
 #ifdef TRINITY
         Eluna::Push(L, unit->getPowerType());
-#endif
-#ifdef MANGOS
-#if (defined(WOTLK))
-        Eluna::Push(L, unit->GetPowerType());
 #else
-        Eluna::Push(L, unit->getPowerType());
-#endif
-#endif
-#ifdef CMANGOS
         Eluna::Push(L, unit->GetPowerType());
 #endif
         return 1;
@@ -940,15 +922,7 @@ namespace LuaUnit
 
 #ifdef TRINITY
         unit->setPowerType((Powers)type);
-#endif
-#ifdef MANGOS
-#if (defined(WOTLK))
-        unit->SetPowerType((Powers)type);
 #else
-        unit->setPowerType((Powers)type);
-#endif
-#endif
-#ifdef CMANGOS
         unit->SetPowerType((Powers)type);
 #endif
         return 0;