From 8be23fcbbdf26e8169defd761e61765f301bebe0 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 1 Jul 2017 20:18:02 +0200 Subject: [3.3.5] Combat/Threat rewrite - prep & refactor (#19966) * Combat/Threat rewrite (PR #19930) prep work. Mostly refactors, and a compatibility layer on ThreatManager/HostileReference that allows scripts to be changed already. (cherry picked from commit e2a1ccd118d129b96e09ff1a15ed0adb1d4a3897) --- src/server/scripts/Spells/spell_warlock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts/Spells') diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 3c8480e85f2..6186ead5d9a 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -1347,7 +1347,7 @@ class spell_warl_soulshatter : public SpellScriptLoader { Unit* caster = GetCaster(); if (Unit* target = GetHitUnit()) - if (target->CanHaveThreatList() && target->getThreatManager().getThreat(caster) > 0.0f) + if (target->CanHaveThreatList() && target->GetThreatManager().IsThreatenedBy(caster, true)) caster->CastSpell(target, SPELL_WARLOCK_SOULSHATTER, true); } -- cgit v1.2.3