From ddb9c2a6988f9397ab041fa123d39ca5c6ae9470 Mon Sep 17 00:00:00 2001
From: Ovalord <1Don7H4v3@m41L.com>
Date: Thu, 15 Mar 2018 22:06:03 +0100
Subject: [PATCH] Core/Units: fixed a possible crash location caused by
 nullpointers

---
 src/server/game/Entities/Unit/Unit.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 71d8bda059..a0180745cc 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10139,9 +10139,6 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup)
     // This needs to be before RemoveFromWorld to make GetCaster() return a valid pointer on aura removal
     InterruptNonMeleeSpells(true);
 
-    if (IsInWorld())
-        RemoveFromWorld();
-
     ASSERT(GetGUID());
 
     // A unit may be in removelist and not in world, but it is still in grid
@@ -10157,6 +10154,9 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup)
     ClearComboPointHolders();
     DeleteThreatList();
     getHostileRefManager().deleteReferences();
+
+    if (IsInWorld())
+        RemoveFromWorld();
 }
 
 void Unit::CleanupsBeforeDelete(bool finalCleanup)