--HG--
branch : trunk
This commit is contained in:
megamage committed 2009-02-23 17:04:15 -06:00
commit 5fe7b48037
26 files changed
+1868 -1813

No files matched your search

+7 -1
View File
@@ -148,7 +148,13 @@ Map* MapInstanced::GetInstance(const WorldObject* obj)
// instantiate or find existing bg map for player
// the instance id is set in battlegroundid
NewInstanceId = player->GetBattleGroundId();
assert(NewInstanceId);
if(!NewInstanceId)
{
if(player->GetSession()->PlayerLoading())
return NULL;
else
assert(NewInstanceId);
}
map = _FindMap(NewInstanceId);
if(!map)
map = CreateBattleGround(NewInstanceId);