From 9ede3a546f7ff6256265fc17198d47b2bc0e345e Mon Sep 17 00:00:00 2001
From: avarishd <46330494+avarishd@users.noreply.github.com>
Date: Thu, 5 Jun 2025 22:07:34 +0300
Subject: [PATCH] fix(Scripts/UP): King Ymiron should use only 1 boat ability
 at a time & Spirit Fount speed (#22081)

---
 .../Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index c922640ee..0a1487f15 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -271,6 +271,7 @@ public:
                             king->SetDisableGravity(true);
                             me->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE);
                             me->GetMotionMaster()->MoveChase(me->GetVictim());
+                            events.CancelEventGroup(1);
                             switch (BoatOrder[BoatNum - 1])
                             {
                                 case 0:
@@ -298,7 +299,7 @@ public:
                             sf->SetSpeed(MOVE_RUN, 0.4f);
                             sf->AddAura(IsHeroic() ? SPELL_SPIRIT_FOUNT_H : SPELL_SPIRIT_FOUNT_N, sf);
                             sf->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-                            sf->GetMotionMaster()->MoveFollow(me->GetVictim(), 0, rand_norm()*M_PI * 2);
+                            sf->GetMotionMaster()->MoveFollow(me->GetVictim(), 0, rand_norm()*M_PI * 2, MOTION_SLOT_ACTIVE, false, false);
                         }
                         break;
                     }