From b4f9844ce0e542fd9181fe30eb35376a98e83fbe Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 7 May 2022 16:39:55 +0200 Subject: [PATCH] Scripts/Misc: added a few more nullptr checks in DamageTaken hooks --- .../BastionOfTwilight/boss_ascendant_council.cpp | 4 ++-- .../scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp index 66982f7ef6..429e06bdd5 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp @@ -563,7 +563,7 @@ struct npc_feludius final : public ScriptedAI void DamageTaken(Unit* attacker, uint32& damage) override { - if (attacker->HasAura(SPELL_FLAME_IMBUED)) + if (attacker && attacker->HasAura(SPELL_FLAME_IMBUED)) damage *= 2; if (me->HealthBelowPctDamaged(25, damage)) @@ -731,7 +731,7 @@ struct npc_ignacious final : public ScriptedAI void DamageTaken(Unit* attacker, uint32& damage) override { - if (attacker->HasAura(SPELL_FROST_IMBUED)) + if (attacker && attacker->HasAura(SPELL_FROST_IMBUED)) damage *= 2; if (me->HealthBelowPctDamaged(25, damage)) 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 35c39def21..9c9c9f9ca9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -733,7 +733,7 @@ class boss_flame_leviathan_defense_turret : public CreatureScript void DamageTaken(Unit* who, uint32 &damage) override { - if (!CanAIAttack(who)) + if (!who || !CanAIAttack(who)) damage = 0; }