aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2018-01-18 13:58:40 -0300
committerariel- <ariel-@users.noreply.github.com>2018-01-18 13:58:40 -0300
commit0db5c2df3fe56f42293865e87ec781cd4d41598b (patch)
treedf671abc0631637261038f17841adc7c417caf16 /src/server/scripts/World
parentd9d26200f7ffc07507dfca4a2c17fdfcde0194c8 (diff)
Core/Scripts: added nullptr checks to DamageTaken hooks
Since cb9e72e521d3cc415dd15bf6912c87f89e41b92a attacker may not be in world when hook is called
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/npcs_special.cpp3
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 f6fb881b07e..1a8a5e97738 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1781,7 +1781,8 @@ public:
void DamageTaken(Unit* doneBy, uint32& damage) override
{
- _damageTimes[doneBy->GetGUID()] = GameTime::GetGameTime();
+ if (doneBy)
+ _damageTimes[doneBy->GetGUID()] = GameTime::GetGameTime();
damage = 0;
}