Merge https://github.com/Regalis11/Barotrauma into develop

2022-12-20 12:29:13 -03:00
parent 5288b58d47 b8fa677148
commit 5807900556
23 changed files with 219 additions and 108 deletions
@@ -28,7 +28,7 @@ namespace Barotrauma.Items.Components
            msg.WriteBoolean(launch);
            if (launch)
            {
-                msg.WriteUInt16(User.ID);
+                msg.WriteUInt16(User?.ID ?? Entity.NullEntityID);
                msg.WriteSingle(launchPos.X);
                msg.WriteSingle(launchPos.Y);
                msg.WriteSingle(launchRot);