aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/MapInstanced.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index dfb673955c3..4d37a515efb 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -125,7 +125,11 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player, uint32 in
if(IsBattleGroundOrArena())
{
assert(player->GetBattleGroundId());
- return CreateBattleGround(player->GetBattleGroundId());
+ instanceId = player->GetBattleGroundId();
+ if(instanceId)
+ if(Map *map = _FindMap(instanceId))
+ return map;
+ return CreateBattleGround(instanceId);
}
if(InstanceSave *pSave = player->GetInstanceSave(GetId()))