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

*Fix a crash.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-29 11:58:19 -06:00
parent 3733af4d6a
commit e528611141
3 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/Map.cpp
View File

@@ -1074,27 +1074,31 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll)
return false;
DEBUG_LOG("Unloading grid[%u,%u] for map %u", x,y, i_id);
ObjectGridUnloader unloader(*grid);
if(!unloadAll)
{
// Finish creature moves, remove and delete all creatures with delayed remove before moving to respawn grids
// Must know real mob position before move
DoDelayedMovesAndRemoves();
MoveAllCreaturesInMoveList();
// move creatures to respawn grids if this is diff.grid or to remove list
unloader.MoveToRespawnN();
// Finish creature moves, remove and delete all creatures with delayed remove before unload
DoDelayedMovesAndRemoves();
MoveAllCreaturesInMoveList();
}
else
RemoveAllObjectsInRemoveList();
//assert(grid.NoWorldObjectInGrid());
ObjectGridCleaner cleaner(*grid);
cleaner.CleanN();
RemoveAllObjectsInRemoveList();
unloader.UnloadN();
//assert(grid.NoWorldObjectInGrid());
//assert(grid.NoGridObjectInGrid());
assert(i_objectsToRemove.empty());
delete grid;
setNGrid(NULL, x, y);
}