From 62c571076e5319c07c7222e139dbfc7c8bb4543f Mon Sep 17 00:00:00 2001 From: ariel- Date: Thu, 18 Jan 2018 13:58:40 -0300 Subject: 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) --- src/server/scripts/World/npcs_special.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server/scripts/World') 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; } -- cgit v1.2.3