*Try to fix crash.

--HG-- branch : trunk
2009-03-31 09:18:39 -06:00
parent be89c6bb2a
commit 031df598ab
14 changed files with 36 additions and 49 deletions
@@ -521,12 +521,12 @@ Player::~Player ()

 void Player::CleanupsBeforeDelete()
 {
-    if(m_uint32Values)                                      // only for fully created Object
+    if(IsInWorld())                                      // only for fully created Object
    {
        TradeCancel(false);
        DuelComplete(DUEL_INTERUPTED);
+        Unit::CleanupsBeforeDelete();
    }
-    Unit::CleanupsBeforeDelete();
 }

 bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId )