Switched bard check in auto attack to IsBardSong

This commit is contained in:
Michael Cook (mackal) 2013-12-20 18:43:16 -05:00
parent 5ac23a2f8f
commit d3ad253b51

View File

@ -271,14 +271,14 @@ bool Client::Process() {
Things which prevent us from attacking: Things which prevent us from attacking:
- being under AI control, the AI does attacks - being under AI control, the AI does attacks
- being dead - being dead
- casting a spell (not sure what the rest is doing, prolly bard) - casting a spell and bard check
- not having a target - not having a target
- being stunned or mezzed - being stunned or mezzed
- having used a ranged weapon recently - having used a ranged weapon recently
*/ */
if(auto_attack) { if(auto_attack) {
if(!IsAIControlled() && !dead 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() && !IsStunned() && !IsFeared() && !IsMezzed() && GetAppearance() != eaDead && !IsMeleeDisabled()
) )
may_use_attacks = true; may_use_attacks = true;