From 175eba74aee742b8aa97b940983a0ddbd7b4bdf7 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 21 Dec 2019 13:30:59 +0100 Subject: Scripts: Add missing killer nullptr checks in JustDied hooks --- .../scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp | 2 +- .../scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 5b8a8b3b858..a998d886e5b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -155,7 +155,7 @@ public: void JustDied(Unit* killer) override { - if (killer->GetEntry() == me->GetEntry()) + if (killer && killer->GetEntry() == me->GetEntry()) return; Talk(SAY_DEATH); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 766a7b0a544..4ecd7695a75 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -987,7 +987,7 @@ class npc_gluttonous_abomination : public CreatureScript void JustDied(Unit* killer) override { - if (killer->GetEntry() == NPC_VALITHRIA_DREAMWALKER) + if (killer && killer->GetEntry() == NPC_VALITHRIA_DREAMWALKER) return; DoCastSelf(SPELL_ROT_WORM_SPAWNER, true); -- cgit v1.2.3