aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/MapInstanced.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index 4d37a515efb..4817c463f6e 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -124,15 +124,13 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player, uint32 in
if(IsBattleGroundOrArena())
{
- assert(player->GetBattleGroundId());
instanceId = player->GetBattleGroundId();
if(instanceId)
if(Map *map = _FindMap(instanceId))
return map;
return CreateBattleGround(instanceId);
}
-
- if(InstanceSave *pSave = player->GetInstanceSave(GetId()))
+ else if(InstanceSave *pSave = player->GetInstanceSave(GetId()))
{
if(!instanceId)
{