From a0b6e052a1d8541d70494225effebea42438ea68 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 21 Jan 2023 12:51:12 +1300
Subject: [PATCH] Fix nullspace floating (#13621)

---
 Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs b/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs
index 48bdd605a9..67da1e5169 100644
--- a/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs
+++ b/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs
@@ -28,6 +28,12 @@ public abstract class SharedFloatingVisualizerSystem : EntitySystem
 
     protected bool CanFloat(EntityUid uid, FloatingVisualsComponent component, TransformComponent? transform = null)
     {
+        if (!Resolve(uid, ref transform))
+            return false;
+
+        if (transform.MapID == MapId.Nullspace)
+            return false;
+
         component.CanFloat = GravitySystem.IsWeightless(uid, xform: transform);
         Dirty(component);
         return component.CanFloat;