1 files changed, 21 insertions, 24 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 6cba36d3af1..e946ac80322 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -798,32 +798,29 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
     {
         m_procAttacker |= PROC_FLAG_ON_TRAP_ACTIVATION;
     }
-    else
+    /*
+        Effects which are result of aura proc from triggered spell cannot proc
+        to prevent chain proc of these spells
+    */
+    if ((triggeredByAura && !triggeredByAura->GetParentAura()->GetTarget()->CanProc()))
     {
-        /*
-            Effects which are result of aura proc from triggered spell cannot proc
-            to prevent chain proc of these spells
-        */
-        if ((triggeredByAura && !triggeredByAura->GetParentAura()->GetTarget()->CanProc()))
-        {
-            m_canTrigger=false;
-        }
+        m_canTrigger=false;
+    }
 
-        // Ranged autorepeat attack is set as triggered spell - ignore it
-        if (!(m_procAttacker & PROC_FLAG_SUCCESSFUL_RANGED_HIT))
-        {
-            if (m_IsTriggeredSpell && 
-                (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER ||
-                m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_2))
-                m_procEx |= PROC_EX_INTERNAL_CANT_PROC;
-            else if (m_IsTriggeredSpell)
-                m_procEx |= PROC_EX_INTERNAL_TRIGGERED;
-        }
-        // Totem casts require spellfamilymask defined in spell_proc_event to proc
-        if (m_originalCaster && m_caster != m_originalCaster && m_caster->GetTypeId()==TYPEID_UNIT && ((Creature*)m_caster)->isTotem() && m_caster->IsControlledByPlayer())
-        {
-            m_procEx |= PROC_EX_INTERNAL_REQ_FAMILY;
-        }
+    // Ranged autorepeat attack is set as triggered spell - ignore it
+    if (!(m_procAttacker & PROC_FLAG_SUCCESSFUL_RANGED_HIT))
+    {
+        if (m_IsTriggeredSpell && 
+            (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER ||
+            m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_2))
+            m_procEx |= PROC_EX_INTERNAL_CANT_PROC;
+        else if (m_IsTriggeredSpell)
+            m_procEx |= PROC_EX_INTERNAL_TRIGGERED;
+    }
+    // Totem casts require spellfamilymask defined in spell_proc_event to proc
+    if (m_originalCaster && m_caster != m_originalCaster && m_caster->GetTypeId()==TYPEID_UNIT && ((Creature*)m_caster)->isTotem() && m_caster->IsControlledByPlayer())
+    {
+        m_procEx |= PROC_EX_INTERNAL_REQ_FAMILY;
     }
 }