diff --git a/common/spdat.cpp b/common/spdat.cpp index 8211ecfdc..7b0e54089 100644 --- a/common/spdat.cpp +++ b/common/spdat.cpp @@ -3214,14 +3214,6 @@ bool IsResistanceOnlySpell(uint16 spell_id) { } bool IsDamageShieldOnlySpell(uint16 spell_id) { - if (SpellEffectsCount(spell_id) == 1 && IsEffectInSpell(spell_id, SE_DamageShield)) { - return true; - } - - return false; -} - -bool IsDamageShieldAndResistanceSpellOnly(uint16 spell_id) { if (!IsValidSpell(spell_id)) { return false; } @@ -3234,19 +3226,10 @@ bool IsDamageShieldAndResistanceSpellOnly(uint16 spell_id) { } if ( - spell.effect_id[i] == SE_DamageShield || - spell.effect_id[i] == SE_ResistFire || - spell.effect_id[i] == SE_ResistCold || - spell.effect_id[i] == SE_ResistPoison || - spell.effect_id[i] == SE_ResistDisease || - spell.effect_id[i] == SE_ResistMagic || - spell.effect_id[i] == SE_ResistCorruption || - spell.effect_id[i] == SE_ResistAll + spell.effect_id[i] != SE_DamageShield ) { - continue; + return false; } - - return false; } return true; diff --git a/common/spdat.h b/common/spdat.h index 60257a401..4c1b52eca 100644 --- a/common/spdat.h +++ b/common/spdat.h @@ -1726,6 +1726,5 @@ bool IsResurrectSpell(uint16 spell_id); bool RequiresStackCheck(uint16 spellType); bool IsResistanceOnlySpell(uint16 spell_id); bool IsDamageShieldOnlySpell(uint16 spell_id); -bool IsDamageShieldAndResistanceSpellOnly(uint16 spell_id); #endif diff --git a/zone/bot.cpp b/zone/bot.cpp index 370e689d9..ece357a23 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -10953,7 +10953,7 @@ bool Bot::IsValidSpellTypeBySpellID(uint16 spellType, uint16 spell_id) { switch (spellType) { case BotSpellTypes::Buff: case BotSpellTypes::PetBuffs: - if (IsResistanceOnlySpell(spell_id) || IsDamageShieldOnlySpell(spell_id) || IsDamageShieldAndResistanceSpellOnly(spell_id)) { + if (IsResistanceOnlySpell(spell_id) || IsDamageShieldOnlySpell(spell_id)) { return false; } @@ -10967,7 +10967,7 @@ bool Bot::IsValidSpellTypeBySpellID(uint16 spellType, uint16 spell_id) { return false; case BotSpellTypes::DamageShields: case BotSpellTypes::PetDamageShields: - if (IsDamageShieldOnlySpell(spell_id) || IsDamageShieldAndResistanceSpellOnly(spell_id)) { + if (IsDamageShieldOnlySpell(spell_id)) { return true; }