From 9e3b4fe409e401bdffa44dc479177aa1b5fe96b1 Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Fri, 11 Nov 2011 14:11:58 -0500
Subject: Cleanup before deleting objects when unloading grid. Fix #3922.

---
 src/server/game/Entities/Object/Object.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/server/game/Entities/Object')

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index a354422c9ae..978d9accb64 100755
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1273,6 +1273,8 @@ void WorldObject::setActive(bool on)
 
 void WorldObject::CleanupsBeforeDelete(bool /*finalCleanup*/)
 {
+    if (IsInWorld())
+        RemoveFromWorld();
 }
 
 void WorldObject::_Create(uint32 guidlow, HighGuid guidhigh, uint32 phaseMask)
-- 
cgit v1.2.3