From 19bbe2cd79e9efe40def828c8cab912cd801252d Mon Sep 17 00:00:00 2001 From: Christopher Galbraith <39371221+ChrisCGalbraith@users.noreply.github.com> Date: Sat, 31 Jul 2021 10:16:02 +0100 Subject: [PATCH] fix(Script/Mandorik): enrage on reset and on subsequent pulls. (#7176) * Fixed issue with Ohgan data not being reset properly causing Mandokir to enrage even when Ohgan is alive on subsequent pulls. Mandokir now correctly removes Frenzy when resetting. Signed-off-by: ChrisCGalbraith * Update src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Co-authored-by: ChrisCGalbraith Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com> --- .../scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index aea2a1489..e3eafe996 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -105,14 +105,17 @@ public: { if (me->GetPositionZ() > 140.0f) { - killCount = 0; events.ScheduleEvent(EVENT_CHECK_START, 1000); if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_VILEBRANCH_SPEAKER))) if (!speaker->IsAlive()) speaker->Respawn(true); } + + killCount = 0; + me->RemoveAurasDueToSpell(SPELL_FRENZY); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); summons.DespawnAll(); + instance->SetBossState(DATA_OHGAN, NOT_STARTED); me->Mount(MODEL_OHGAN_MOUNT); }