diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 5d241e9f69..8d47afb835 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -5760,7 +5760,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const caster->DealDamageMods(target, damage, &absorb); // Set trigger flag - uint32 procAttacker = 0, procVictim = 0; + uint32 procAttacker, procVictim = PROC_FLAG_NONE; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_CASTER_PROCS)) procAttacker = PROC_FLAG_DONE_PERIODIC; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) @@ -5770,7 +5770,8 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const if (damage) { hitMask |= crit ? PROC_HIT_CRITICAL : PROC_HIT_NORMAL; - procVictim |= PROC_FLAG_TAKEN_DAMAGE; + if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) + procVictim |= PROC_FLAG_TAKEN_DAMAGE; } int32 overkill = damage - target->GetHealth(); @@ -5854,7 +5855,7 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c damage = damageInfo.GetDamage(); // Set trigger flag - uint32 procAttacker = 0, procVictim = 0; + uint32 procAttacker, procVictim = PROC_FLAG_NONE; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_CASTER_PROCS)) procAttacker = PROC_FLAG_DONE_PERIODIC; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) @@ -6030,7 +6031,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const if (GetAuraType() == SPELL_AURA_OBS_MOD_HEALTH) return; - uint32 procAttacker = 0, procVictim = 0; + uint32 procAttacker, procVictim = PROC_FLAG_NONE; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_CASTER_PROCS)) procAttacker = PROC_FLAG_DONE_PERIODIC; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) @@ -6206,7 +6207,7 @@ void AuraEffect::HandlePeriodicPowerBurnAuraTick(Unit* target, Unit* caster) con caster->SendSpellNonMeleeDamageLog(&damageInfo); // Set trigger flag - uint32 procAttacker = 0, procVictim = 0; + uint32 procAttacker, procVictim = PROC_FLAG_NONE; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_CASTER_PROCS)) procAttacker = PROC_FLAG_DONE_PERIODIC; if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) @@ -6216,7 +6217,9 @@ void AuraEffect::HandlePeriodicPowerBurnAuraTick(Unit* target, Unit* caster) con uint32 spellTypeMask = PROC_SPELL_TYPE_NO_DMG_HEAL; if (damageInfo.damage) { - procVictim |= PROC_FLAG_TAKEN_DAMAGE; + if (!m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) + procVictim |= PROC_FLAG_TAKEN_DAMAGE; + spellTypeMask |= PROC_SPELL_TYPE_DAMAGE; } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 117475f4b4..1566216718 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -622,8 +622,8 @@ m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerO effectHandleMode = SPELL_EFFECT_HANDLE_LAUNCH; m_damage = 0; m_healing = 0; - m_procAttacker = 0; - m_procVictim = 0; + m_procAttacker = PROC_FLAG_NONE; + m_procVictim = PROC_FLAG_NONE; m_hitMask = 0; focusObject = nullptr; m_cast_count = 0; @@ -2083,7 +2083,7 @@ void Spell::prepareDataForTriggerSystem() // Create base triggers flags for Attacker and Victim (m_procAttacker, m_procVictim and m_hitMask) //========================================================================================== - m_procVictim = m_procAttacker = 0; + m_procVictim = m_procAttacker = PROC_FLAG_NONE; // Get data for type of attack and fill base info for trigger switch (m_spellInfo->DmgClass) { @@ -2142,9 +2142,9 @@ void Spell::prepareDataForTriggerSystem() // Some spells may not trigger any procs at all. if (m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_CASTER_PROCS)) - m_procAttacker = 0; - if (m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_CASTER_PROCS)) - m_procVictim = 0; + m_procAttacker = PROC_FLAG_NONE; + if (m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_TARGET_PROCS)) + m_procVictim = PROC_FLAG_NONE; } void Spell::CleanupTargetList()