From ea0a344af57af8985dea3b7ecd2be6ea3e115876 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Fri, 2 Sep 2022 14:31:48 +0200 Subject: [PATCH] =?UTF-8?q?fix(Core/Spells):=20Fixed=20spell=20error=20whe?= =?UTF-8?q?n=20players=20tries=20to=20disarm=20rang=E2=80=A6=20(#12885)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Core/Spells): Fixed spell error when players tries to disarm ranged-armed victim. Fixes #11803 --- src/server/game/Spells/SpellInfo.cpp | 38 ++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 7bb066785..a9a73f07c 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1788,14 +1788,42 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta // Not allow disarm unarmed player if (Mechanic == MECHANIC_DISARM) { - if (unitTarget->GetTypeId() == TYPEID_PLAYER) + bool valid = false; + for (uint8 i = BASE_ATTACK; i < MAX_ATTACK; ++i) { - Player const* player = unitTarget->ToPlayer(); - if (!player->GetWeaponForAttack(BASE_ATTACK, true)) - return SPELL_FAILED_TARGET_NO_WEAPONS; + AuraType disarmAuraType = SPELL_AURA_MOD_DISARM; + switch (i) + { + case OFF_ATTACK: + disarmAuraType = SPELL_AURA_MOD_DISARM_OFFHAND; + break; + case RANGED_ATTACK: + disarmAuraType = SPELL_AURA_MOD_DISARM_RANGED; + break; + } + + if (HasAura(disarmAuraType)) + { + if (Player const* player = unitTarget->ToPlayer()) + { + if (player->GetWeaponForAttack(WeaponAttackType(BASE_ATTACK + i), true)) + { + valid = true; + break; + } + } + else if (unitTarget->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i)) + { + valid = true; + break; + } + } } - else if (!unitTarget->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID)) + + if (!valid) + { return SPELL_FAILED_TARGET_NO_WEAPONS; + } } } }