diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 1a6db2c481..151d554377 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -609,29 +609,30 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData) recvData >> guid; recvData >> status; - if (GetPlayer()->IsAlive()) + Player* player = GetPlayer(); + if (!player) + return; + + if (player->IsAlive()) return; if (status == 0) { - GetPlayer()->ClearResurrectRequestData(); // reject + player->ClearResurrectRequestData(); // reject return; } - if (!GetPlayer()->IsResurrectRequestedBy(guid)) + if (!player->IsResurrectRequestedBy(guid)) return; - if (Player* ressPlayer = ObjectAccessor::GetPlayer(*GetPlayer(), guid)) + if (InstanceScript* instance = player->GetInstanceScript()) { - if (InstanceScript* instance = ressPlayer->GetInstanceScript()) + if (instance->IsEncounterInProgress() && player->GetMap()->IsRaid()) { - if ((instance->IsEncounterInProgress() && ressPlayer->GetMap()->IsRaid())) - { - if (!instance->GetCombatResurrectionCharges()) - return; - else - instance->UseCombatResurrection(); - } + if (!instance->GetCombatResurrectionCharges()) + return; + else + instance->UseCombatResurrection(); } } diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 303569f622..e89333c47c 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -366,29 +366,22 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) if (minion->isWorldBoss() && minion->IsAlive()) return false; - switch (state) - { - case IN_PROGRESS: - { - uint32 resInterval = GetCombatResurrectionChargeInterval(); - if (instance->Is25ManRaid() || (instance->Is25ManRaid() && instance->IsHeroic())) - { - InitializeCombatResurrections(3, resInterval); - } - else if (instance->IsRaid()) - { - InitializeCombatResurrections(1, resInterval); - } - break; - } - - case FAIL: - case DONE: - ResetCombatResurrections(); - break; - default: - break; - } + if (instance->IsRaid()) + { + switch (state) + { + case IN_PROGRESS: + InitializeCombatResurrections(); + SendEncounterUnit(ENCOUNTER_FRAME_SET_COMBAT_RES_LIMIT); + break; + case FAIL: + case DONE: + SendEncounterUnit(ENCOUNTER_FRAME_RESET_COMBAT_RES_LIMIT); + break; + default: + break; + } + } bossInfo->state = state; SaveToDB(); @@ -842,55 +835,14 @@ void InstanceScript::UpdatePhasing() PhasingHandler::SendToPlayer(player); } -void InstanceScript::UpdateCombatResurrection(uint32 diff) +void InstanceScript::InitializeCombatResurrections() { - if (!_combatResurrectionTimerStarted) - return; - - _combatResurrectionTimer -= diff; - if (_combatResurrectionTimer <= 0) - { - AddCombatResurrectionCharge(); - _combatResurrectionTimerStarted = false; - } -} - -void InstanceScript::InitializeCombatResurrections(uint8 charges /*= 1*/, uint32 interval /*= 0*/) -{ - _combatResurrectionCharges = charges; - if (!interval) - return; - - _combatResurrectionTimer = interval; - _combatResurrectionTimerStarted = true; // true; -} - -void InstanceScript::AddCombatResurrectionCharge() -{ - // ++_combatResurrectionCharges; - _combatResurrectionTimer = GetCombatResurrectionChargeInterval(); - _combatResurrectionTimerStarted = true; + if (instance->IsRaid()) + _combatResurrectionCharges = instance->Is25ManRaid() ? 3 : 1; } void InstanceScript::UseCombatResurrection() { - --_combatResurrectionCharges; -} - -void InstanceScript::ResetCombatResurrections() -{ - _combatResurrectionCharges = 0; - _combatResurrectionTimer = 0; - _combatResurrectionTimerStarted = 0; -} - -uint32 InstanceScript::GetCombatResurrectionChargeInterval() const -{ - // This System here is from MoP and not Cataclysm. - // In Cataclysm have 10 Man Raids 1 Resurrection and 25 Man Raids 3 Resurrection free. - uint32 interval = 0; - if (uint32 playerCount = instance->GetPlayers().getSize()) - interval = 90 * MINUTE * IN_MILLISECONDS / playerCount; - - return interval; + _combatResurrectionCharges--; + SendEncounterUnit(ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT); } diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index c891e93a79..9604b9c70f 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -172,7 +172,6 @@ class TC_GAME_API InstanceScript : public ZoneScript void SaveToDB(); virtual void Update(uint32 /*diff*/) { } - void UpdateCombatResurrection(uint32 /*diff*/); // Used by the map's CannotEnter function. // This is to prevent players from entering during boss encounters. @@ -265,12 +264,9 @@ class TC_GAME_API InstanceScript : public ZoneScript void ResetAreaTriggerDone(uint32 id) { _activatedAreaTriggers.erase(id); } bool IsAreaTriggerDone(uint32 id) const { return _activatedAreaTriggers.find(id) != _activatedAreaTriggers.end(); } - void InitializeCombatResurrections(uint8 charges = 1, uint32 interval = 0); - void AddCombatResurrectionCharge(); + void InitializeCombatResurrections(); void UseCombatResurrection(); - void ResetCombatResurrections(); uint8 GetCombatResurrectionCharges() const { return _combatResurrectionCharges; } - uint32 GetCombatResurrectionChargeInterval() const; protected: void SetHeaders(std::string const& dataHeaders); @@ -318,9 +314,7 @@ class TC_GAME_API InstanceScript : public ZoneScript ObjectInfoMap _gameObjectInfo; ObjectGuidMap _objectGuids; uint32 completedEncounters; // completed encounter mask, bit indexes are DungeonEncounter.dbc boss numbers, used for packets - uint32 _combatResurrectionTimer; uint8 _combatResurrectionCharges; // the counter for available battle resurrections - bool _combatResurrectionTimerStarted; std::unordered_set _activatedAreaTriggers; std::vector const* const _instanceSpawnGroups; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 26adefa581..34be0fa5f1 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3882,10 +3882,7 @@ void InstanceMap::Update(uint32 t_diff) Map::Update(t_diff); if (i_data) - { i_data->Update(t_diff); - i_data->UpdateCombatResurrection(t_diff); - } } void InstanceMap::RemovePlayerFromMap(Player* player, bool remove) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 7ad68bd772..af600b1ba8 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5103,6 +5103,12 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_ONLY_INDOORS; } + if (m_spellInfo->HasAttribute(SPELL_ATTR8_BATTLE_RESURRECTION) && m_caster->GetMap()->IsRaid()) + if (InstanceScript* instance = m_caster->GetInstanceScript()) + if (instance->IsEncounterInProgress()) + if (!instance->GetCombatResurrectionCharges()) + return SPELL_FAILED_IN_COMBAT_RES_LIMIT_REACHED; + // only check at first call, Stealth auras are already removed at second call // for now, ignore triggered spells if (strict && !(_triggeredCastFlags & TRIGGERED_IGNORE_SHAPESHIFT))