From 5ebfe5a297b74fa08b10534637aa55b8538e4688 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 26 Nov 2015 21:47:50 +0100 Subject: [PATCH] Scripts/EyeOfEternity: Fix crash Fix crash happening when a player would kill a Melee npc on the disks during Malygos fight and mount it before it ended the waypoint path. Close #15900 (cherry picked from commit 6e296ddaa20a51327f7666f6ddaac60e4216ee23) --- .../scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 8c097fe1c35..4923c1bbe9a 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1244,8 +1244,9 @@ public: ++_wpCount; } else if (Vehicle* hoverDisk = me->GetVehicleKit()) - if (Unit* lordPassenger = hoverDisk->GetPassenger(0)) - lordPassenger->ToCreature()->AI()->DoAction(ACTION_SET_DISK_VICTIM_CHASE); + if (Unit* passenger = hoverDisk->GetPassenger(0)) + if (Creature* lordPassenger = passenger->ToCreature()) + lordPassenger->AI()->DoAction(ACTION_SET_DISK_VICTIM_CHASE); } private: