From 0241653d42237165e88cf9e2fbeb43b0e47b86e7 Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sat, 1 Aug 2009 03:37:40 +0200
Subject: [PATCH] *Fix a problem with instantioned bgs introduced in 4697.

--HG--
branch : trunk
---
 src/game/MapInstanced.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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()))