From 91786703abcf7a02443db3f80c83877751438845 Mon Sep 17 00:00:00 2001
From: ksklyarov <k.sklyarov@sprinthost.ru>
Date: Tue, 19 Nov 2019 01:04:19 +0300
Subject: [PATCH 1/2] rename trinity->acore also in luaengine

---
 GlobalMethods.h | 2 +-
 GuildMethods.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GlobalMethods.h b/GlobalMethods.h
index 06188f2..5ee4ab5 100644
--- a/GlobalMethods.h
+++ b/GlobalMethods.h
@@ -183,7 +183,7 @@ namespace LuaGlobalFunctions
 #ifdef TRINITY
             boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
 #elif defined(AZEROTHCORE)
-            TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
+            ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
 #else
             HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
 #endif
diff --git a/GuildMethods.h b/GuildMethods.h
index e8dab6f..3bb50fd 100644
--- a/GuildMethods.h
+++ b/GuildMethods.h
@@ -39,7 +39,7 @@ namespace LuaGuild
 #ifdef TRINITY
             boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
 #elif defined(AZEROTHCORE)
-            TRINITY_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
+            ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
 #else
             HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
 #endif

From ac7475893b99d50e5b2f60fdab5ed95b32a4820f Mon Sep 17 00:00:00 2001
From: ksklyarov <k.sklyarov@sprinthost.ru>
Date: Tue, 19 Nov 2019 01:09:24 +0300
Subject: [PATCH 2/2] fix build also for #2455

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

diff --git a/GlobalMethods.h b/GlobalMethods.h
index 5ee4ab5..b5b528a 100644
--- a/GlobalMethods.h
+++ b/GlobalMethods.h
@@ -1964,7 +1964,7 @@ namespace LuaGlobalFunctions
         switch (banMode)
         {
             case BAN_ACCOUNT:
-#ifdef TRINITY
+#if defined TRINITY || AZEROTHCORE
                 if (!Utf8ToUpperOnlyLatin(nameOrIP))
                     return luaL_argerror(L, 2, "invalid account name");
 #else