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

*Cleanup about deleting player.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-10 23:32:20 -05:00
parent 4ecbefabfa
commit 31374835f6
4 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/Map.cpp
View File

@@ -202,7 +202,7 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par
: i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode), i_InstanceId(InstanceId), m_unloadTimer(0),
m_activeNonPlayersIter(m_activeNonPlayers.end()),
i_gridExpiry(expiry), m_parentMap(_parent ? _parent : this)
, i_lock(true)
, i_lock(false)
{
m_notifyTimer.SetInterval(IN_MILISECONDS/2);
@@ -665,6 +665,8 @@ void Map::RemoveUnitFromNotify(Unit *unit, int32 slot)
assert(slot < i_unitsToNotify.size());
i_unitsToNotify[slot] = NULL;
}
unit->m_NotifyListPos = -1;
}
void Map::Update(const uint32 &t_diff)
@@ -816,17 +818,12 @@ void Map::Remove(Player *player, bool remove)
CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
{
if(remove)
player->CleanupsBeforeDelete();
sLog.outCrash("Map::Remove: Player is in invalid cell!");
// invalid coordinates
player->RemoveFromWorld();
if( remove )
{
player->ResetMap();
DeleteFromWorld(player);
}
return;
}
@@ -843,9 +840,6 @@ void Map::Remove(Player *player, bool remove)
NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
assert(grid != NULL);
if(remove)
player->CleanupsBeforeDelete();
player->RemoveFromWorld();
RemoveFromGrid(player,grid,cell);