diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-12-21 13:30:59 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-19 13:12:42 +0100 |
| commit | e30683fda4fda1f6c9ad0d03f1f7aa225379ab38 (patch) | |
| tree | c08901e484182c3c4813799bdb344194a0bd9029 /src | |
| parent | e539de68e10a64b0f0a0619eb5213ab5315b01c9 (diff) | |
Scripts: Add missing killer nullptr checks in JustDied hooks
(cherry picked from commit 175eba74aee742b8aa97b940983a0ddbd7b4bdf7)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 783505c84b1..10d3891e109 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -154,7 +154,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 63e5055c7c0..f16eb9c73e6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -988,7 +988,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); |