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

*Fix a crash caused by bg and arena.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-17 09:28:38 -05:00
parent 698b43f088
commit f4efa0f1df
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/game/MapInstanced.cpp
View File

@@ -121,21 +121,25 @@ Map* MapInstanced::GetInstance(const WorldObject* obj)
Player* player = (Player*)obj;
uint32 instanceId = player->GetInstanceId();
if(IsBattleGroundOrArena())
{
if(!instanceId)
instanceId = player->GetBattleGroundId();
if(instanceId)
return _FindMap(instanceId);
else
return NULL;
}
if(instanceId)
if(Map *map = _FindMap(instanceId))
return map;
if(IsBattleGroundOrArena())
{
instanceId = player->GetBattleGroundId();
if(instanceId)
{
if(Map *map = _FindMap(instanceId))
return map;
else
return CreateBattleGround(instanceId);
}
else
return NULL;
}
InstancePlayerBind *pBind = player->GetBoundInstance(GetId(), player->GetDifficulty());
InstanceSave *pSave = pBind ? pBind->save : NULL;
if(!pBind || !pBind->perm)