From 6e0d0acd36b00e51e87906864790901a90eb34d8 Mon Sep 17 00:00:00 2001
From: MDIC <joshua.lee.betts@gmail.com>
Date: Mon, 18 Apr 2022 10:51:50 -0400
Subject: [PATCH] Added Null Checks

---
 src/AnticheatMgr.cpp | 15 ++++++++++++---
 src/cs_anticheat.cpp | 17 +++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/AnticheatMgr.cpp b/src/AnticheatMgr.cpp
index c7526f4..e301863 100644
--- a/src/AnticheatMgr.cpp
+++ b/src/AnticheatMgr.cpp
@@ -705,9 +705,18 @@ void AnticheatMgr::BuildReport(Player* player, uint16 reportType)
         Aura* dungdesert = player->AddAura(LFG_SPELL_DUNGEON_DESERTER, player);// LFG_SPELL_DUNGEON_DESERTER
         Aura* bgdesert = player->AddAura(BG_SPELL_DESERTER, player);// BG_SPELL_DESERTER
         Aura* silent = player->AddAura(SILENCED, player);// SILENCED
-        dungdesert->SetDuration(-1);
-        bgdesert->SetDuration(-1);
-        silent->SetDuration(-1);
+        if (dungdesert)// LFG_SPELL_DUNGEON_DESERTER
+        {
+            dungdesert->SetDuration(-1);
+        }
+        if (bgdesert)// BG_SPELL_DESERTER
+        {
+            bgdesert->SetDuration(-1);
+        }
+        if (silent)// SILENCED
+        {
+            silent->SetDuration(-1);
+        }
 
         if (sConfigMgr->GetOption<bool>("Anticheat.AnnounceJail", true))
         {
diff --git a/src/cs_anticheat.cpp b/src/cs_anticheat.cpp
index 31e79ca..d62fae4 100644
--- a/src/cs_anticheat.cpp
+++ b/src/cs_anticheat.cpp
@@ -140,10 +140,19 @@ public:
         pTarget->CastSpell(pTarget, SHACKLES); // Shackle him in place to ensure no exploit happens for jail break attempt
         Aura* dungdesert = pTarget->AddAura(LFG_SPELL_DUNGEON_DESERTER, pTarget);// LFG_SPELL_DUNGEON_DESERTER
         Aura* bgdesert = pTarget->AddAura(BG_SPELL_DESERTER, pTarget);// BG_SPELL_DESERTER
-        Aura* silent = pTarget->AddAura(SILENCED, pTarget);// SILENCED
-        dungdesert->SetDuration(-1);
-        bgdesert->SetDuration(-1);
-        silent->SetDuration(-1);
+        Aura* silent = pTarget->AddAura(SILENCED, pTarget);// SILENC
+        if (dungdesert)// LFG_SPELL_DUNGEON_DESERTER
+        {
+            dungdesert->SetDuration(-1);
+        }
+        if (bgdesert)// BG_SPELL_DESERTER
+        {
+            bgdesert->SetDuration(-1);
+        }
+        if (silent)// SILENCED
+        {
+            silent->SetDuration(-1);
+        }
 
         return true;
     }