From 30c23e48be52211c6af6d8b1152ee947b252abca Mon Sep 17 00:00:00 2001 From: sevi Date: Thu, 30 Mar 2017 20:24:44 +0200 Subject: [PATCH] Core/Misc: the battle rezz limit didn't should has a effect in normal/heroic dungeons. They is only for Raids. --- src/server/game/Handlers/MiscHandler.cpp | 2 +- src/server/game/Instances/InstanceScript.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 9b9af1d450..665af1f9b0 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -621,7 +621,7 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData) { if (InstanceScript* instance = ressPlayer->GetInstanceScript()) { - if (instance->IsEncounterInProgress()) + if ((instance->IsEncounterInProgress() && player->GetMap()->IsRaid())) { if (!instance->GetCombatResurrectionCharges()) return; diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 04e19c712c..a06d04a31b 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -316,7 +316,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state) { InitializeCombatResurrections(3, resInterval); } - else + else if (instance->IsRaid()) { InitializeCombatResurrections(1, resInterval); }