From ce3d0170f6ad114912014092a663ecdf20a3e5f8 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sun, 25 Oct 2009 03:24:04 +0300
Subject: [PATCH] [8729] Fix crash added in [8725]. Sorry.

---
 src/game/Object.cpp      | 1 +
 src/game/Unit.cpp        | 2 +-
 src/shared/revision_nr.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index d3acf7d0c..c6c48df7c 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1112,6 +1112,7 @@ WorldObject::WorldObject()
 
 void WorldObject::CleanupsBeforeDelete()
 {
+    RemoveFromWorld();
 }
 
 void WorldObject::_Create( uint32 guidlow, HighGuid guidhigh, uint32 phaseMask )
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 309c09875..a282c96d1 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11110,7 +11110,7 @@ void Unit::CleanupsBeforeDelete()
         RemoveAllDynObjects();
         GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
     }
-    RemoveFromWorld();
+    WorldObject::CleanupsBeforeDelete();
 }
 
 CharmInfo* Unit::InitCharmInfo(Unit *charm)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5c1e51df3..cd01b7874 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8728"
+ #define REVISION_NR "8729"
 #endif // __REVISION_NR_H__