From 8046d5a94f9b4cea88e0042fb2adf2f74de5d942 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 27 Feb 2016 12:02:32 +0100 Subject: Scripts/Ulduar: Fix crash Change an assert to a NULL check on Flame Leviathan vehicle kit, it can be NULL on map unload. Close #16662 (cherry picked from commit 31cd082833926539c56569ff6faabc139f5f3223) --- src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 495e007b2ec..937ccf4d5f3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -334,7 +334,8 @@ class boss_flame_leviathan : public CreatureScript void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_START_THE_ENGINE) - ASSERT_NOTNULL(me->GetVehicleKit())->InstallAllAccessories(false); + if (Vehicle* vehicleKit = me->GetVehicleKit()) + vehicleKit->InstallAllAccessories(false); if (spell->Id == SPELL_ELECTROSHOCK) me->InterruptSpell(CURRENT_CHANNELED_SPELL); -- cgit v1.2.3