diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-18 13:58:40 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-06-16 12:02:14 +0200 |
| commit | 62c571076e5319c07c7222e139dbfc7c8bb4543f (patch) | |
| tree | 234a3a61c51a3dec6517ab29f3904005f4cb66b8 /src/server/scripts/World | |
| parent | ea79b5569809515e680d8e38dd8126f11f5fa666 (diff) | |
Core/Scripts: added nullptr checks to DamageTaken hooks
Since cb9e72e521d3cc415dd15bf6912c87f89e41b92a attacker may not be in world when hook is called
(cherry picked from commit 0db5c2df3fe56f42293865e87ec781cd4d41598b)
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 575c566da85..0e0cf7a1d85 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1776,7 +1776,8 @@ public: void DamageTaken(Unit* doneBy, uint32& damage) override { - _damageTimes[doneBy->GetGUID()] = GameTime::GetGameTime(); + if (doneBy) + _damageTimes[doneBy->GetGUID()] = GameTime::GetGameTime(); damage = 0; } |