aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Object
diff options
context:
space:
mode:
authormegamage <none@none.none>2011-11-11 14:11:58 -0500
committermegamage <none@none.none>2011-11-11 14:11:58 -0500
commit9e3b4fe409e401bdffa44dc479177aa1b5fe96b1 (patch)
tree9d9056429b11873821324a27ad631eec1d28a413 /src/server/game/Entities/Object
parent360c9dd63520bb3b156e9c139231d081d4ba55bf (diff)
Cleanup before deleting objects when unloading grid. Fix #3922.
Diffstat (limited to 'src/server/game/Entities/Object')
-rwxr-xr-xsrc/server/game/Entities/Object/Object.cpp2
1 files changed, 2 insertions, 0 deletions
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)