From 452eb463988cd6f4c39ed9682606995d95826702 Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sat, 1 Aug 2009 04:13:28 +0200
Subject: *Prevent possible creation of instance from bg map.

--HG--
branch : trunk
---
 src/game/MapInstanced.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/game/MapInstanced.cpp')

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)
         {
-- 
cgit v1.2.3