Retaliation should not proc while in CC.

coolzoom · Apr 13, 2024 · 2a4c9b1 · 2a4c9b1
1 parent ff60917
commit 2a4c9b1
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp
@@ -644,6 +644,15 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit* pVictim, uint32 amount, uint
                     if (!HasInArc(pVictim))
                         return SPELL_AURA_PROC_FAILED;
 
+                    // World of Warcraft Client Patch 1.7.0 (2005-09-13)
+                    // - Retaliation - Will now cause a maximum of 30 retaliatory strikes in
+                    //  15 seconds.In addition, retaliatory strikes will not be possible
+                    //  while stunned.
+#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_6_1
+                    if (HasUnitState(UNIT_STAT_CAN_NOT_REACT))
+                        return SPELL_AURA_PROC_FAILED;
+#endif
+
                     triggered_spell_id = 22858;
                     break;
                 }
@@ -946,16 +955,6 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit* pVictim, uint32 amount, uint
                     return SPELL_AURA_PROC_FAILED;
                 triggered_spell_id = 26654;
             }
-            // Retaliation
-            if (dummySpell->IsFitToFamilyMask<CF_WARRIOR_RETALIATION>())
-            {
-                // check attack comes not from behind
-                if (!HasInArc(pVictim))
-                    return SPELL_AURA_PROC_FAILED;
-
-                triggered_spell_id = 22858;
-                break;
-            }
             break;
         }
         case SPELLFAMILY_WARLOCK: