Spell: Add combo point check from tbc

cmangos · Mar 8, 2023 · 5a59df6 · 5a59df6
1 parent 8c045f5
commit 5a59df6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp
@@ -4559,6 +4559,10 @@ SpellCastResult Spell::CheckCast(bool strict)
             if (m_spellInfo->HasAttribute(SPELL_ATTR_ONLY_STEALTHED) && !(m_caster->HasStealthAura()))
                 return SPELL_FAILED_ONLY_STEALTHED;
         }
+
+        if (!m_IsTriggeredSpell && NeedsComboPoints(m_spellInfo) && (!m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetObjectGuid() != m_caster->GetComboTargetGuid()))
+            // warrior not have real combo-points at client side but use this way for mark allow Overpower use
+            return m_caster->getClass() == CLASS_WARRIOR ? SPELL_FAILED_CASTER_AURASTATE : SPELL_FAILED_NO_COMBO_POINTS;
     }
 
     if (m_trueCaster->IsPlayer())