Merge branch 'repack22' into devcopy2

ratkosrb · Jun 23, 2023 · 1c2eac1 · 1c2eac1
2 parents a299795 + 4ba5d4f
commit 1c2eac1
Show file tree

Hide file tree

Showing 7 changed files with 756 additions and 2 deletions.
diff --git a/src/game/Anticheat/Anticheat.cpp b/src/game/Anticheat/Anticheat.cpp
@@ -32,6 +32,7 @@ AnticheatManager* GetAnticheatLib()
 #include "World.h"
 #include "WorldSession.h"
 
+#include "Antispam/Antispam.h"
 #include "MovementAnticheat/MovementAnticheat.h"
 #include "WardenAnticheat/Warden.hpp"
 #include "WardenAnticheat/WardenScanMgr.hpp"
@@ -51,6 +52,10 @@ AnticheatManager::~AnticheatManager()
 
 void AnticheatManager::LoadAnticheatData()
 {
+    sLog.Out(LOG_ANTICHEAT, LOG_LVL_MINIMAL, "");
+    sLog.Out(LOG_ANTICHEAT, LOG_LVL_MINIMAL, "Loading antispam system ...");
+    sAntispam->loadConfig();
+
     sLog.Out(LOG_ANTICHEAT, LOG_LVL_MINIMAL, "");
     sLog.Out(LOG_ANTICHEAT, LOG_LVL_MINIMAL, "Loading warden checks...");
     sWardenScanMgr.LoadFromDB();
@@ -179,4 +184,9 @@ void AnticheatManager::RemoveWardenSession(Warden* warden)
     m_wardenSessionsToRemove.push_back(warden);
 }
 
+AntispamInterface* AnticheatManager::GetAntispam() const
+{
+    return sAntispam;
+}
+
 #endif
diff --git a/src/game/Anticheat/Anticheat.h b/src/game/Anticheat/Anticheat.h
@@ -135,9 +135,11 @@ class AnticheatManager
     ~AnticheatManager();
     void LoadAnticheatData();
 
-    Warden * CreateWardenFor(WorldSession* client, BigNumber* K);
+    Warden* CreateWardenFor(WorldSession* client, BigNumber* K);
     MovementAnticheat* CreateAnticheatFor(Player* player);
 
+    AntispamInterface* GetAntispam() const;
+
     void StartWardenUpdateThread();
     void StopWardenUpdateThread();
     void UpdateWardenSessions();
@@ -166,6 +168,8 @@ class AnticheatManager
         return new MovementAnticheat();
     }
 
+    AntispamInterface* GetAntispam() const { return nullptr; }
+
     void StartWardenUpdateThread() {}
     void StopWardenUpdateThread() {}
     void UpdateWardenSessions() {}
@@ -175,7 +179,6 @@ class AnticheatManager
 
 public:
     // Antispam wrappers
-    AntispamInterface* GetAntispam() const { return nullptr; }
     bool CanWhisper(AccountPersistentData const& data, MasterPlayer* player) { return true; }
 
     static AnticheatManager* instance();