Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Call item::removefromworld after unit::removefromworld to prevent crash.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-18 10:45:38 -05:00
parent 3a309abfab
commit 4f10fa008d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/Player.cpp
View File

@@ -1838,6 +1838,11 @@ void Player::RemoveFromWorld()
sOutdoorPvPMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId);
}
///- Do not add/remove the player from the object storage
///- It will crash when updating the ObjectAccessor
///- The player should only be removed when logging out
Unit::RemoveFromWorld();
for(int i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
{
if(m_items[i])
@@ -1847,11 +1852,6 @@ void Player::RemoveFromWorld()
for (ItemMap::iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter)
iter->second->RemoveFromWorld();
///- Do not add/remove the player from the object storage
///- It will crash when updating the ObjectAccessor
///- The player should only be removed when logging out
Unit::RemoveFromWorld();
if(m_uint32Values)
{
if(WorldObject *viewpoint = GetViewpoint())