*Fix some crash when unit is removed.

--HG--
branch : trunk

src/game/Player.cpp

@@ -511,10 +511,7 @@ void Player::CleanupsBeforeDelete()
     TradeCancel(false);
     DuelComplete(DUEL_INTERUPTED);
 
-    if(IsInWorld())                                      // only for fully created Object
-    {
     Unit::CleanupsBeforeDelete();
-    }
 
     if (m_transport)
         m_transport->RemovePassenger(this);

src/game/Unit.cpp

@@ -11323,8 +11323,10 @@ void Unit::RemoveFromWorld()
 
 void Unit::CleanupsBeforeDelete()
 {
-    if(IsInWorld())                                      // only for fully created object
+    assert(m_uint32Values);
-    {
+
+    //A unit may be in removelist and not in world, but it is still in grid
+    //and may have some references during delete
     RemoveAllAuras();
     InterruptNonMeleeSpells(true);
     m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
@@ -11336,9 +11338,9 @@ void Unit::CleanupsBeforeDelete()
     RemoveAllDynObjects();
     GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
 
+    if(IsInWorld())
         RemoveFromWorld();
 }
-}
 
 void Unit::UpdateCharmAI()
 {