diff options
| author | QAston <none@none> | 2009-08-01 04:13:28 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-08-01 04:13:28 +0200 |
| commit | 452eb463988cd6f4c39ed9682606995d95826702 (patch) | |
| tree | 07096f1446a714b763869af0c7dee14e4b2088d5 /src | |
| parent | 0241653d42237165e88cf9e2fbeb43b0e47b86e7 (diff) | |
*Prevent possible creation of instance from bg map.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/MapInstanced.cpp | 4 |
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) { |