Updates to methods from core changes

Author: Niam5

ElunaUtility.cpp

@@ -12,6 +12,7 @@
 #include "GameObject.h"
 #if ELUNA_EXPANSION == EXP_RETAIL
 #include "DB2Stores.h"
+#include "IpAddress.h"
 #else
 #include "DBCStores.h"
 #endif
@@ -216,3 +217,12 @@ unsigned char* ElunaUtil::DecodeData(const char *data, size_t *output_length)
 
     return decoded_data;
 }
+
+#if ELUNA_EXPANSION == EXP_RETAIL
+bool ElunaUtil::IsIPAddress(std::string const& text)
+{
+    boost::system::error_code error;
+    Trinity::Net::make_address(text, error);
+    return !error;
+}
+#endif

ElunaUtility.h

@@ -188,6 +188,10 @@ namespace ElunaUtil
      * The returned result buffer must be `delete[]`ed by the caller.
      */
     unsigned char* DecodeData(const char* data, size_t *output_length);
+
+#if ELUNA_EXPANSION == EXP_RETAIL
+    bool IsIPAddress(std::string const& text);
+#endif
 };
 
 #endif

methods/TrinityCore/GlobalMethods.h

@@ -1959,7 +1959,11 @@ namespace LuaGlobalFunctions
                 mode = BanMode::BAN_CHARACTER;
                 break;
             case BAN_IP:
+#if ELUNA_EXPANSION < EXP_RETAIL
                 if (!IsIPAddress(nameOrIP.c_str()))
+#else
+                if (!ElunaUtil::IsIPAddress(nameOrIP))
+#endif
                     return luaL_argerror(E->L, 2, "invalid ip");
                 mode = BanMode::BAN_IP;
                 break;

methods/TrinityCore/MapMethods.h

@@ -133,7 +133,7 @@ namespace LuaMap
 #if ELUNA_EXPANSION < EXP_RETAIL
         E->Push(map->GetDifficulty());
 #else
-        E->Push(map->GetMapDifficulty());
+        E->Push(map->GetDifficultyID());
 #endif
         return 1;
     }