From e5eea44e0afb038d9b04e61b93d69f25e37879af Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sat, 22 Aug 2015 00:14:46 -0300 Subject: Scripts/OnyxiasLair: Force Onyxia to enter evade mode if pulled out of her room (cherry picked from commit b28849003c881d0a05624195d435ea903c13d4f8) --- src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 76fe8819716..65d6565ad9a 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -316,9 +316,20 @@ public: MovePoint = iTemp; } + bool CheckInRoom() override + { + if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 95.0f) + { + EnterEvadeMode(); + return false; + } + + return true; + } + void UpdateAI(uint32 diff) override { - if (!UpdateVictim()) + if (!UpdateVictim() || !CheckInRoom()) return; //Common to PHASE_START && PHASE_END -- cgit v1.2.3