diff options
| author | QAston <none@none> | 2009-05-15 16:51:26 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-05-15 16:51:26 +0200 |
| commit | 4a20e22af360433608083e879bf35c6a7fd48303 (patch) | |
| tree | 408dc012619dea9623fc04d2d6dd0aea7d35c3c7 /src/game/Spell.cpp | |
| parent | ab195a1031f03c7e473aa15ecba0bf600de4642d (diff) | |
*Do not proc relentless strikes with slice and dice twice
*Fix trap radius calculation in some cases-by krz
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 2c778616d78..43c33700bce 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -980,7 +980,8 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) m_spellAura = NULL; // Set aura to null for every target-make sure that pointer is not used for unit without aura applied //Spells with this flag cannot trigger if effect is casted on self - bool canEffectTrigger = (m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST ? m_caster != unitTarget : true); + // Slice and Dice, relentless strikes, eviscerate + bool canEffectTrigger = (m_spellInfo->AttributesEx4 & (SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST | SPELL_ATTR_EX4_UNK4) ? m_caster!=unitTarget : true) Unit * spellHitTarget = NULL; if (missInfo==SPELL_MISS_NONE) // In case spell hit target, do all effect on that target @@ -1258,7 +1259,7 @@ void Spell::DoTriggersOnSpellHit(Unit *unit) } // spells with this flag can trigger only if not selfcast (eviscerate for example) - if (m_ChanceTriggerSpells.size() && (!(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST) || unit!=m_caster)) + if (m_ChanceTriggerSpells.size() && (!(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST | SPELL_ATTR_EX4_UNK4) || unit!=m_caster)) { int _duration=0; for(ChanceTriggerSpells::const_iterator i = m_ChanceTriggerSpells.begin(); i != m_ChanceTriggerSpells.end(); ++i) |