From 7f5706abcf2966e00994836b96a72b78cb80657a Mon Sep 17 00:00:00 2001 From: KayenEQ Date: Fri, 28 Jan 2022 22:07:23 -0500 Subject: [PATCH] bard throw while casting (#1937) --- zone/special_attacks.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 0a51d10fb..4d9114dde 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -219,8 +219,8 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) { if (!GetTarget()) return; - // make sure were actually able to use such an attack. - if (spellend_timer.Enabled() || IsFeared() || IsStunned() || IsMezzed() || DivineAura() || dead) + // make sure were actually able to use such an attack. (Bards can throw while casting. ~Kayen confirmed on live 1/22) + if ((spellend_timer.Enabled() && GetClass() != BARD)|| IsFeared() || IsStunned() || IsMezzed() || DivineAura() || dead) return; pTimerType timer = pTimerCombatAbility; @@ -229,7 +229,6 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk) if (ClientVersion() >= EQ::versions::ClientVersion::RoF2 && ca_atk->m_skill == EQ::skills::SkillTigerClaw) timer = pTimerCombatAbility2; - bool CanBypassSkillCheck = false; if (ca_atk->m_skill == EQ::skills::SkillBash) { // SLAM - Bash without a shield equipped @@ -1356,7 +1355,7 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51 } if(!IsAttackAllowed(other) || - IsCasting() || + (IsCasting() && GetClass() != BARD) || IsSitting() || (DivineAura() && !GetGM()) || IsStunned() ||