From 77d3eb52df95dc9186f2cd37555b97ca103046d9 Mon Sep 17 00:00:00 2001 From: Jelle Meeus Date: Wed, 26 Jun 2024 22:23:09 +0200 Subject: [PATCH] fix(Core/Spell): Bladestorm remove reset swing and allow meleeSwingSpell during (#19093) * remove reset swing * allow meleeswingspell on PLAYER_ALLOW_ONLY_ABILITY --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 ------ src/server/game/Spells/Spell.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 5a533f307..4fa18baed 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4106,12 +4106,6 @@ void AuraEffect::HandleModStateImmunityMask(AuraApplication const* aurApp, uint8 // Patch 3.0.3 Bladestorm now breaks all snares and roots on the warrior when activated. if (GetId() == 46924) { - if (apply) - { - target->resetAttackTimer(); - target->resetAttackTimer(OFF_ATTACK); - } - // Knockback and hex target->ApplySpellImmune(GetId(), IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, apply); } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b73096ec8..36d62c192 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5645,7 +5645,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_caster->GetTypeId() == TYPEID_PLAYER) { //can cast triggered (by aura only?) spells while have this flag - if (!HasTriggeredCastFlag(TRIGGERED_IGNORE_CASTER_AURASTATE) && m_caster->ToPlayer()->HasPlayerFlag(PLAYER_ALLOW_ONLY_ABILITY)) + if (!HasTriggeredCastFlag(TRIGGERED_IGNORE_CASTER_AURASTATE) && m_caster->ToPlayer()->HasPlayerFlag(PLAYER_ALLOW_ONLY_ABILITY) && !IsNextMeleeSwingSpell()) return SPELL_FAILED_SPELL_IN_PROGRESS; if (!HasTriggeredCastFlag(TRIGGERED_IGNORE_SPELL_AND_CATEGORY_CD) && m_caster->ToPlayer()->HasSpellCooldown(m_spellInfo->Id))