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

Do not call AddObjectToRemoveList(Pet*) in Map::MoveAllCreaturesInMoveList(). Fix #2892.

Browse Source
This commit is contained in:
megamage
2011-09-12 11:44:32 -04:00
parent fc8d2f91f4
commit 2dbf64827a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Maps/Map.cpp
+9 -1
View File
@@ -824,9 +824,17 @@ void Map::MoveAllCreaturesInMoveList()
} }
else else
{ {
//AddObjectToRemoveList(Pet*) should only be called in Pet::Remove
//This may happen when a player just logs in and a pet moves to a nearby unloaded cell
//To avoid this, we can load nearby cells when player log in
//But this check is always needed to ensure safety
if (c->isPet())
{
((Pet*)c)->Remove(PET_SAVE_NOT_IN_SLOT, true);
}
// if creature can't be move in new cell/grid (not loaded) move it to repawn cell/grid // if creature can't be move in new cell/grid (not loaded) move it to repawn cell/grid
// creature coordinates will be updated and notifiers send // creature coordinates will be updated and notifiers send
if (!CreatureRespawnRelocation(c)) else if (!CreatureRespawnRelocation(c))
{ {
// ... or unload (if respawn grid also not loaded) // ... or unload (if respawn grid also not loaded)
#ifdef TRINITY_DEBUG #ifdef TRINITY_DEBUG