fix(Core/Spells): Don't remove shield-dependant auras in Dismantle (azerothcore#25658)

espkk · web-flow · commit 0b32c50fb2b1 · 2026-04-30T07:16:53.000-05:00
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -12551,8 +12551,7 @@ bool Player::HasItemFitToSpellRequirements(SpellInfo const* spellInfo, Item cons
                             return true;
 
                     // Keep active non-passive auras (e.g. Shield Wall) when disarmed
-                    Item* offhand = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
-                    if (!spellInfo->IsPassive() && offhand && offhand != ignoreItem)
+                    if (!spellInfo->IsPassive() && HasAuraType(SPELL_AURA_MOD_DISARM_OFFHAND) && GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
                     {
                         for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
                             if (spellInfo->Effects[i].IsAura())

Original file line number	Diff line number	Diff line change
`@@ -12551,8 +12551,7 @@ bool Player::HasItemFitToSpellRequirements(SpellInfo const* spellInfo, Item cons`
`12551`	`12551`	`return true;`
`12552`	`12552`
`12553`	`12553`	`// Keep active non-passive auras (e.g. Shield Wall) when disarmed`
`12554`		`- Item* offhand = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);`
`12555`		`- if (!spellInfo->IsPassive() && offhand && offhand != ignoreItem)`
	`12554`	`+ if (!spellInfo->IsPassive() && HasAuraType(SPELL_AURA_MOD_DISARM_OFFHAND) && GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))`
`12556`	`12555`	`{`
`12557`	`12556`	`for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)`
`12558`	`12557`	`if (spellInfo->Effects[i].IsAura())`