From ebe89b875f14455cfe9a479cbe75254beb1e18b2 Mon Sep 17 00:00:00 2001 From: Alexandru-Mihai Maftei Date: Sat, 30 Dec 2023 15:47:02 +0000 Subject: [PATCH] fix(Scripts/ScarletMonastery): Prevent Whitemane from dying before resurrecting Mograine (#18082) The current code only prevents Whitemane from dying before casting sleep, but the players can inflict enough DPS on her before that, that she can die before resurrecting Mograine. When this happens, the dungeon is broken and cannot progress. --- .../ScarletMonastery/instance_scarlet_monastery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 9be35e30b..87ed30423 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -538,7 +538,7 @@ public: void DamageTaken(Unit* /*doneBy*/, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if (!canResurrectCheck && damage >= me->GetHealth()) + if ((!canResurrectCheck || canResurrect) && damage >= me->GetHealth()) damage = me->GetHealth() - 1; }