Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Allow creating new instance when log in and a save exists.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-16 16:52:45 -05:00
parent a5df3c9e72
commit a0ba5dc206
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/MapInstanced.cpp
View File

@@ -145,15 +145,26 @@ Map* MapInstanced::GetInstance(const WorldObject* obj)
pSave = groupBind->save;
}
if(instanceId && pSave && instanceId != pSave->GetInstanceId())
return NULL;
if(!player->GetSession()->PlayerLoading()) // enter a new map
if(pSave)
{
if(pSave)
return CreateInstance(pSave->GetInstanceId(), pSave, pSave->GetDifficulty());
else
return CreateInstance(MapManager::Instance().GenerateInstanceId(), NULL, player->GetDifficulty());
if(!instanceId)
{
instanceId = pSave->GetInstanceId(); // go from outside to instance
if(Map *map = _FindMap(instanceId))
return map;
}
else if(instanceId != pSave->GetInstanceId()) // cannot go from one instance to another
return NULL;
// else log in at a saved instance
return CreateInstance(instanceId, pSave, pSave->GetDifficulty());
}
else if(!player->GetSession()->PlayerLoading())
{
if(!instanceId)
instanceId = MapManager::Instance().GenerateInstanceId();
return CreateInstance(instanceId, NULL, player->GetDifficulty());
}
return NULL;