aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-01-27 21:54:47 +0100
committerShauren <shauren.trinity@gmail.com>2016-01-27 21:54:47 +0100
commit8bc3f5545e28b827bd1e642a718b25b482d7cd58 (patch)
treeeae1c64080af7816590e0a512ec5a088aa3899a4
parent3f503cd1d10c1785ef1520ff960e0577131b6005 (diff)
parent4b4237174fa7cfefadad38dbe236213c33390225 (diff)
Merge pull request #16378 from Zedron/6.x
Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon
-rw-r--r--src/server/scripts/Spells/spell_paladin.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 5e8b5ab8885..5887aded51c 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -912,6 +912,8 @@ class spell_pal_light_s_beacon : public SpellScriptLoader
bool CheckProc(ProcEventInfo& eventInfo)
{
+ if (!eventInfo.GetActionTarget())
+ return false;
if (eventInfo.GetActionTarget()->HasAura(SPELL_PALADIN_BEACON_OF_LIGHT, eventInfo.GetActor()->GetGUID()))
return false;
return true;