diff options
| author | megamage <none@none> | 2009-05-01 18:37:32 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-01 18:37:32 -0500 |
| commit | db817d668aab117b3abddcc617610f9a38f66798 (patch) | |
| tree | ebf4b73d3f2ce7aca6bc1289b4d98eb4065aed42 /src/game/GameObject.cpp | |
| parent | e1b8fff590c6aca21297ecc638b29b59c4507cfe (diff) | |
| parent | c9cd3b07f9e69030a86bcd9f06055f4247732d1d (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 61e742735fb..54760a99b78 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -93,6 +93,9 @@ void GameObject::RemoveFromWorld() ///- Remove the gameobject from the accessor if(IsInWorld()) { + if(Map *map = FindMap()) + if(map->IsDungeon() && ((InstanceMap*)map)->GetInstanceData()) + ((InstanceMap*)map)->GetInstanceData()->OnObjectRemove(this); // Possible crash at access to deleted GO in Unit::m_gameobj if(uint64 owner_guid = GetOwnerGUID()) { |