diff options
| author | Artamedes <ownedned123@gmail.com> | 2019-09-06 14:09:47 -0400 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-18 21:44:43 +0100 |
| commit | 8fbaab7337f4c68ace351cc101da6908d4b2cabd (patch) | |
| tree | 280ee1e1714f0f4998e99cd6ef0c40f4a33b3707 | |
| parent | 0b43b435668f8da5a737d7f427f1596379284c5a (diff) | |
Scripts/Ulduar: Fix Stormcaller Brundir walking into walls (#23755)
* Scripts/Ulduar: Fix Stormcaller Brundir walking into walls
* Cleanup and fix logic + review
* Review: remove autos
(cherry picked from commit 876a8487301088fec1580e7c9ef6bf98783d9d7d)
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index cd9bb6baa8b..6f02c7bd321 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -494,6 +494,9 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 15min); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 4s); events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 120000)); + + if (Creature* trigger = me->FindNearestCreature(NPC_WORLD_TRIGGER, 100.0f)) + m_TriggerGUID = trigger->GetGUID(); } void DoAction(int32 action) override @@ -625,11 +628,20 @@ class boss_stormcaller_brundir : public CreatureScript { float x = float(irand(-25, 25)); float y = float(irand(-25, 25)); - me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + x, me->GetPositionY() + y, me->GetPositionZ()); + + Position pos = me->GetPosition(); + + pos.m_positionX += x; + pos.m_positionY += y; + // Prevention to go outside the room or into the walls - if (Creature* trigger = me->FindNearestCreature(NPC_WORLD_TRIGGER, 100.0f, true)) - if (me->GetDistance(trigger) >= 50.0f) + if (Creature* trigger = ObjectAccessor::GetCreature(*me, m_TriggerGUID)) + { + if (pos.GetExactDist2d(trigger) >= 50.0f) me->GetMotionMaster()->MovePoint(0, *trigger); + else + me->GetMotionMaster()->MovePoint(0, pos); + } } events.ScheduleEvent(EVENT_MOVE_POSITION, urand(7500, 10000)); break; @@ -643,6 +655,9 @@ class boss_stormcaller_brundir : public CreatureScript DoMeleeAttackIfReady(); } + + private: + ObjectGuid m_TriggerGUID; }; CreatureAI* GetAI(Creature* creature) const override |