pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-19 14:03:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bard throw while casting (#1937)

Browse Source
This commit is contained in:
KayenEQ 2022-01-28 22:07:23 -05:00 committed by GitHub
parent 44b8c9203a
commit 7f5706abcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/special_attacks.cpp
View File

@ -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() ||