From 71b70185909cd992879e6b285b317a1e0b170e9a Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 16 Jun 2022 22:28:50 -0400 Subject: [PATCH] Core/Player: Distinguish between ranged and non-ranged weapons in GetWeaponForAttack Port From (https://github.com/TrinityCore/TrinityCore/commit/5517208b67cf5c0b8054067cee081e968e66694d) --- Source/Game/Entities/Player/Player.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index ce429e5ef..11b63b76e 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -7559,9 +7559,13 @@ namespace Game.Entities item = GetUseableItemByPos(InventorySlots.Bag0, slot); else item = GetItemByPos(InventorySlots.Bag0, slot); + if (item == null || item.GetTemplate().GetClass() != ItemClass.Weapon) return null; + if ((attackType == WeaponAttackType.RangedAttack) != item.GetTemplate().IsRangedWeapon()) + return null; + if (!useable) return item;