tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't swing out of range (#11964)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-10-17 02:54:43 +11:00
committed by GitHub
parent 20f68d156e
commit 85926cf209
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -165,6 +165,14 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
} }
var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition); 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; EntityCoordinates coordinates;
// Bro why would I want a ternary here // Bro why would I want a ternary here