From 6448bf3869c3b4e96107605cb3427d0014dac42e Mon Sep 17 00:00:00 2001
From: Winfidonarleyan <dowlandtop@yandex.com>
Date: Mon, 15 Mar 2021 21:57:19 +0700
Subject: [PATCH 1/2] feat(GlobalMethods/AzerothCore): switch to new threading
 system

Part https://github.com/azerothcore/azerothcore-wotlk/pull/4821
---
 GlobalMethods.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/GlobalMethods.h b/GlobalMethods.h
index 4dbf972..c4d0039 100644
--- a/GlobalMethods.h
+++ b/GlobalMethods.h
@@ -10,7 +10,9 @@
 #include "BindingMap.h"
 
 #ifdef AZEROTHCORE
+
 #include "BanManager.h"
+
 enum BanMode
 {
     BAN_ACCOUNT = 1,
@@ -198,10 +200,8 @@ namespace LuaGlobalFunctions
         });
 #else
         {
-#ifdef TRINITY
+#if defined TRINITY || AZEROTHCORE
             std::shared_lock<std::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
-#elif defined(AZEROTHCORE)
-            ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
 #else
             HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
 #endif

From 33783f4e14359fd175421483d5dc53f2cc7c119c Mon Sep 17 00:00:00 2001
From: Winfidonarleyan <dowlandtop@yandex.com>
Date: Thu, 18 Mar 2021 23:23:57 +0700
Subject: [PATCH 2/2] Guild

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

diff --git a/GuildMethods.h b/GuildMethods.h
index 42fa417..64b8c19 100644
--- a/GuildMethods.h
+++ b/GuildMethods.h
@@ -36,10 +36,8 @@ namespace LuaGuild
         });
 #else
         {
-#ifdef TRINITY
+#if defined TRINITY || AZEROTHCORE
             std::shared_lock<std::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
-#elif defined(AZEROTHCORE)
-            ACORE_READ_GUARD(HashMapHolder<Player>::LockType, *HashMapHolder<Player>::GetLock());
 #else
             HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
 #endif