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