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

Core/Maps: Ensure one of InstanceScript::Create or InstanceScript::Load is called on map creation

Browse Source
This commit is contained in:
Shauren
2022-10-06 18:34:42 +02:00
parent 9ce47e6809
commit 8c3c07cdf4
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/server/game/Maps/Map.cpp
View File

@@ -2943,20 +2943,26 @@ void InstanceMap::CreateInstanceData()
if (!i_data)
return;
if (i_instanceLock)
if (!i_instanceLock || !i_instanceLock->GetInstanceId())
{
MapDb2Entries entries{ GetEntry(), GetMapDifficulty() };
if (entries.IsInstanceIdBound() || IsRaid() || entries.MapDifficulty->IsRestoringDungeonState() || !i_owningGroupRef.isValid())
{
InstanceLockData const* lockData = i_instanceLock->GetInstanceInitializationData();
i_data->SetCompletedEncountersMask(lockData->CompletedEncountersMask);
i_data->SetEntranceLocation(lockData->EntranceWorldSafeLocId);
if (!lockData->Data.empty())
{
TC_LOG_DEBUG("maps", "Loading instance data for `%s` with id %u", sObjectMgr->GetScriptName(i_script_id).c_str(), i_InstanceId);
i_data->Load(lockData->Data.c_str());
}
}
i_data->Create();
return;
}
MapDb2Entries entries{ GetEntry(), GetMapDifficulty() };
if (!entries.IsInstanceIdBound() && !IsRaid() && !entries.MapDifficulty->IsRestoringDungeonState() && i_owningGroupRef.isValid())
{
i_data->Create();
return;
}
InstanceLockData const* lockData = i_instanceLock->GetInstanceInitializationData();
i_data->SetCompletedEncountersMask(lockData->CompletedEncountersMask);
i_data->SetEntranceLocation(lockData->EntranceWorldSafeLocId);
if (!lockData->Data.empty())
{
TC_LOG_DEBUG("maps", "Loading instance data for `%s` with id %u", sObjectMgr->GetScriptName(i_script_id).c_str(), i_InstanceId);
i_data->Load(lockData->Data.c_str());
}
else
i_data->Create();