From d3ad253b51b85e4f794db6edd0e1bac5326a17a2 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 20 Dec 2013 18:43:16 -0500 Subject: [PATCH] Switched bard check in auto attack to IsBardSong --- zone/client_process.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 0462089e5..dba9f7131 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -271,14 +271,14 @@ bool Client::Process() { Things which prevent us from attacking: - being under AI control, the AI does attacks - being dead - - casting a spell (not sure what the rest is doing, prolly bard) + - casting a spell and bard check - not having a target - being stunned or mezzed - having used a ranged weapon recently */ if(auto_attack) { if(!IsAIControlled() && !dead - && !(spellend_timer.Enabled() && (spells[casting_spell_id].classes[7] < 1 && spells[casting_spell_id].classes[7] > 65)) + && !(spellend_timer.Enabled() && casting_spell_id && !IsBardSong(casting_spell_id)) && !IsStunned() && !IsFeared() && !IsMezzed() && GetAppearance() != eaDead && !IsMeleeDisabled() ) may_use_attacks = true;