Fix custom triggered spells rolling hit chance 2x

Fixes execute
cmangos · Oct 10, 2016 · e9cfc93 · e9cfc93 · boxa · Oct 27, 2016
1 parent 6e327f0
commit e9cfc93
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
@@ -388,6 +388,8 @@ Spell::Spell(Unit* caster, SpellEntry const* info, bool triggered, ObjectGuid or
 
     m_needAliveTargetMask = 0;
 
+    m_ignoreHitResult = false;
+
     // determine reflection
     m_canReflect = false;
 
@@ -852,7 +854,7 @@ void Spell::AddUnitTarget(Unit* pVictim, SpellEffectIndex effIndex)
     target.processed  = false;                              // Effects not applied on target
 
     // Calculate hit result
-    target.missCondition = m_caster->SpellHitResult(pVictim, m_spellInfo, m_canReflect);
+    target.missCondition = m_ignoreHitResult ? SPELL_MISS_NONE : m_caster->SpellHitResult(pVictim, m_spellInfo, m_canReflect);
 
     // spell fly from visual cast object
     WorldObject* affectiveObject = GetAffectiveCasterObject();

diff --git a/src/game/Spell.h b/src/game/Spell.h
@@ -440,6 +440,7 @@ class Spell
         uint8 m_cast_count;
         uint32 m_glyphIndex;
         SpellCastTargets m_targets;
+        bool m_ignoreHitResult;
 
         int32 GetCastTime() const { return m_casttime; }
         uint32 GetCastedTime() { return m_timer; }

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -1267,6 +1267,8 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const* spellInfo, int32 cons
     if (bp2)
         spell->m_currentBasePoints[EFFECT_INDEX_2] = *bp2;
 
+    spell->m_ignoreHitResult = true;
+
     SpellCastTargets targets;
     targets.setUnitTarget(Victim);
     spell->m_CastItem = castItem;