aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <none@none>2009-08-01 03:37:40 +0200
committerQAston <none@none>2009-08-01 03:37:40 +0200
commit0241653d42237165e88cf9e2fbeb43b0e47b86e7 (patch)
tree8293f42f518ad696ff158fe09e399f8583ed4f71 /src
parent00724b0b4f703bd7566cea25c7912aeb0646d3f8 (diff)
*Fix a problem with instantioned bgs introduced in 4697.
--HG-- branch : trunk
Diffstat (limited to 'src')
-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()))