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;