Fix invalid gun coords being sent (#12699)

2022-11-23 17:35:06 +11:00
parent 8868878b70
commit 23be8a1e03
1 changed files with 9 additions and 0 deletions
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -149,6 +149,15 @@ public sealed partial class GunSystem : SharedGunSystem
            return;

        var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition);
+
+        if (mousePos.MapId == MapId.Nullspace)
+        {
+            if (gun.ShotCounter != 0)
+                EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = gun.Owner });
+
+            return;
+        }
+
        EntityCoordinates coordinates;

        // Bro why would I want a ternary here