Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Instances: Removed deprecated field from InstanceScript

Browse Source
This commit is contained in:
Shauren
2023-09-19 00:18:50 +02:00
parent 4bf4ee57ff
commit 1e29c0066e
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Instances/InstanceScript.cpp
View File

@@ -64,7 +64,7 @@ DungeonEncounterEntry const* BossInfo::GetDungeonEncounterForDifficulty(Difficul
return itr != DungeonEncounters.end() ? *itr : nullptr;
}
InstanceScript::InstanceScript(InstanceMap* map) : instance(map), completedEncounters(0), _instanceSpawnGroups(sObjectMgr->GetInstanceSpawnGroupsForMap(map->GetId())),
InstanceScript::InstanceScript(InstanceMap* map) : instance(map), _instanceSpawnGroups(sObjectMgr->GetInstanceSpawnGroupsForMap(map->GetId())),
_entranceId(0), _temporaryEntranceId(0), _combatResurrectionTimer(0), _combatResurrectionCharges(0), _combatResurrectionTimerStarted(false)
{
#ifdef TRINITY_API_USE_DYNAMIC_LINKING
@@ -433,6 +433,8 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
{
DoUpdateCriteria(CriteriaType::DefeatDungeonEncounter, dungeonEncounter->ID);
SendBossKillCredit(dungeonEncounter->ID);
if (dungeonEncounter->CompleteWorldStateID)
DoUpdateWorldState(dungeonEncounter->CompleteWorldStateID, 1);
}
instance->DoOnPlayers([](Player* player)
@@ -494,9 +496,15 @@ void InstanceScript::Load(char const* data)
// in loot-based lockouts instance can be loaded with later boss marked as killed without preceding bosses
// but we still need to have them alive
for (uint32 i = 0; i < bosses.size(); ++i)
{
if (bosses[i].state == DONE && !CheckRequiredBosses(i))
bosses[i].state = NOT_STARTED;
if (DungeonEncounterEntry const* dungeonEncounter = bosses[i].GetDungeonEncounterForDifficulty(instance->GetDifficultyID()))
if (dungeonEncounter->CompleteWorldStateID)
DoUpdateWorldState(dungeonEncounter->CompleteWorldStateID, bosses[i].state == DONE ? 1 : 0);
}
UpdateSpawnGroups();
AfterDataLoad();
}
@@ -905,16 +913,6 @@ void InstanceScript::UpdateEncounterStateForSpellCast(uint32 spellId, Unit* sour
UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, spellId, source);
}
void InstanceScript::SetCompletedEncountersMask(uint32 newMask)
{
completedEncounters = newMask;
if (DungeonEncounterList const* encounters = sObjectMgr->GetDungeonEncounterList(instance->GetId(), instance->GetDifficultyID()))
for (DungeonEncounter const& encounter : *encounters)
if (completedEncounters & (1 << encounter.dbcEntry->Bit) && encounter.dbcEntry->CompleteWorldStateID)
DoUpdateWorldState(encounter.dbcEntry->CompleteWorldStateID, 1);
}
void InstanceScript::UpdatePhasing()
{
instance->DoOnPlayers([](Player const* player)

7
src/server/game/Instances/InstanceScript.h
View File

@@ -288,12 +288,6 @@ class TC_GAME_API InstanceScript : public ZoneScript
void UpdateEncounterStateForKilledCreature(uint32 creatureId, Unit* source);
void UpdateEncounterStateForSpellCast(uint32 spellId, Unit* source);
// Used only during loading
void SetCompletedEncountersMask(uint32 newMask);
// Returns completed encounters mask for packets
uint32 GetCompletedEncounterMask() const { return completedEncounters; }
bool IsEncounterCompleted(uint32 dungeonEncounterId) const;
bool IsEncounterCompletedInMaskByBossId(uint32 completedEncountersMask, uint32 bossId) const;
@@ -381,7 +375,6 @@ class TC_GAME_API InstanceScript : public ZoneScript
ObjectInfoMap _creatureInfo;
ObjectInfoMap _gameObjectInfo;
ObjectGuidMap _objectGuids;
uint32 completedEncounters; // DEPRECATED, REMOVE
std::vector<InstanceSpawnGroupInfo> const* const _instanceSpawnGroups;
std::unordered_set<uint32> _activatedAreaTriggers;
uint32 _entranceId;

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

@@ -2965,7 +2965,6 @@ void InstanceMap::CreateInstanceData()
}
InstanceLockData const* lockData = i_instanceLock->GetInstanceInitializationData();
i_data->SetCompletedEncountersMask(lockData->CompletedEncountersMask);
i_data->SetEntranceLocation(lockData->EntranceWorldSafeLocId);
if (!lockData->Data.empty())
{