From 4b9bc7d6f888011029fdc9cdb9e7a4d58dd723a2 Mon Sep 17 00:00:00 2001 From: killerwife Date: Tue, 17 Jan 2017 21:28:33 +0100 Subject: [PATCH] Trigger trap procs for trap triggerer in case of non-damage traps Fixes Snake Trap and Frost trap not triggering trap talents properly, because those target player due to specific target modes. Should still proc for trap triggerer nonetheless. --- src/game/Spells/Spell.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp index 1e2ff0e0de5..efde3140f61 100644 --- a/src/game/Spells/Spell.cpp +++ b/src/game/Spells/Spell.cpp @@ -1228,7 +1228,8 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) procEx = createProcExtendMask(&damageInfo, missInfo); // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge) if (m_canTrigger && missInfo != SPELL_MISS_REFLECT) - caster->ProcDamageAndSpell(unit, real_caster ? procAttacker : uint32(PROC_FLAG_NONE), procVictim, procEx, 0, m_attackType, m_spellInfo, !!m_triggeredByAuraSpell); + // traps need to be procced at trap triggerer + caster->ProcDamageAndSpell(procAttacker & PROC_FLAG_ON_TRAP_ACTIVATION ? m_targets.getUnitTarget() : unit, real_caster ? procAttacker : uint32(PROC_FLAG_NONE), procVictim, procEx, 0, m_attackType, m_spellInfo, !!m_triggeredByAuraSpell); } // Call scripted function for AI if this spell is casted upon a creature