From 85926cf2093e92d54520f2910a72ee1ddf6fb65e Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 17 Oct 2022 02:54:43 +1100 Subject: [PATCH] Don't swing out of range (#11964) Co-authored-by: metalgearsloth --- Content.Client/Weapons/Melee/MeleeWeaponSystem.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs index 12daf50ec7..dc5a9c6501 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs @@ -165,6 +165,14 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem } var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition); + var attackerPos = Transform(entity).MapPosition; + + if (mousePos.MapId != attackerPos.MapId || + (attackerPos.Position - mousePos.Position).Length > weapon.Range) + { + return; + } + EntityCoordinates coordinates; // Bro why would I want a ternary here