aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-31 09:18:39 -0600
committermegamage <none@none>2009-03-31 09:18:39 -0600
commit031df598ab444ae4ed3d3d66996168d3577fb29d (patch)
treeb85408862f7001e8dc43447bc74bd77ce817e93e /src/game/Player.cpp
parentbe89c6bb2a6a2c5f1a62e2010a9ee97efb8529b2 (diff)
*Try to fix crash.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 707467cd03d..1b885c99874 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -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 )