Skip to content

Commit

Permalink
Trigger trap procs for trap triggerer in case of non-damage traps
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
killerwife committed Aug 4, 2017
1 parent 63200b0 commit 4b9bc7d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/game/Spells/Spell.cpp
Expand Up @@ -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
Expand Down

0 comments on commit 4b9bc7d

Please sign in to comment.