Fixed gloved weapons being able to attack when not equipped. (#26762)

* Initial commit. No evil hidden files this time :)

* Added newline because I forgot :(

* We <3 tags :)

* Fixed! Works now

* Update Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
beck-thompson
2024-04-17 03:10:03 -07:00
committed by GitHub
parent 0785516eac
commit afcdc8b866
3 changed files with 15 additions and 1 deletions

View File

@@ -277,7 +277,10 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (EntityManager.TryGetComponent(entity, out HandsComponent? hands) &&
hands.ActiveHandEntity is { } held)
{
if (EntityManager.TryGetComponent(held, out melee))
// Make sure the entity is a weapon AND it doesn't need
// to be equipped to be used (E.g boxing gloves).
if (EntityManager.TryGetComponent(held, out melee) &&
!melee.MustBeEquippedToUse)
{
weaponUid = held;
return true;