josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-06-18 17:47:12 +02:00
parent c41e432834 4f10fa008d
commit 1f871af996
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+5 -5
View File
@@ -1838,6 +1838,11 @@ void Player::RemoveFromWorld()
sOutdoorPvPMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId); 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) for(int i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
{ {
if(m_items[i]) if(m_items[i])
@@ -1847,11 +1852,6 @@ void Player::RemoveFromWorld()
for (ItemMap::iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter) for (ItemMap::iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter)
iter->second->RemoveFromWorld(); 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(m_uint32Values)
{ {
if(WorldObject *viewpoint = GetViewpoint()) if(WorldObject *viewpoint = GetViewpoint())