Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix the bug that players get stuck after teleported out of bg.

Browse Source 
*Do not delete the map immediately until all players are teleported.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-06 16:14:13 -05:00
parent 50c73d433c
commit befbae3a61
6 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/game/Map.cpp
View File

@@ -1196,6 +1196,21 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll)
return true;
}
void Map::RemoveAllPlayers()
{
if(HavePlayers())
{
sLog.outError("Map::UnloadAll: there are still players in the instance at unload, should not happen!");
for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
{
Player* plr = itr->getSource();
if(!plr->IsBeingTeleportedFar())
plr->TeleportTo(plr->m_homebindMapId, plr->m_homebindX, plr->m_homebindY, plr->m_homebindZ, plr->GetOrientation());
}
}
}
void Map::UnloadAll()
{
// clear all delayed moves, useless anyway do this moves before map unload.
@@ -2642,12 +2657,7 @@ void InstanceMap::PermBindAllPlayers(Player *player)
void InstanceMap::UnloadAll()
{
while(HavePlayers())
{
sLog.outError("InstanceMap::UnloadAll: there are still players in the instance at unload, should not happen!");
Player *plr = m_mapRefManager.getFirst()->getSource();
plr->TeleportOutOfMap(this);
}
assert(!HavePlayers());
if(m_resetAfterUnload == true)
objmgr.DeleteRespawnTimeForInstance(GetInstanceId());
@@ -2734,16 +2744,17 @@ void BattleGroundMap::SetUnload()
m_unloadTimer = MIN_UNLOAD_DELAY;
}
void BattleGroundMap::UnloadAll()
void BattleGroundMap::RemoveAllPlayers()
{
while(HavePlayers())
if(HavePlayers())
{
Player *plr = m_mapRefManager.getFirst()->getSource();
plr->TeleportTo(plr->GetBattleGroundEntryPoint());
plr->TeleportOutOfMap(this);
for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
{
Player* plr = itr->getSource();
if(!plr->IsBeingTeleportedFar())
plr->TeleportTo(plr->GetBattleGroundEntryPoint());
}
}
Map::UnloadAll();
}
/// Put scripts in the execution queue