(7341d33ff) Fixed nullref exception if a fabricator finishes creating an item after the user has been removed.

2019-04-03 16:20:37 +03:00
parent b75db42253
commit 03f2444968
2 changed files with 5 additions and 10 deletions
@@ -110,7 +110,7 @@ namespace Barotrauma
        {
            get
            {
-                return collider[colliderIndex];
+                return collider == null ? null : collider[colliderIndex];
            }
        }

@@ -122,10 +122,10 @@ namespace Barotrauma
            }
            set
            {
-                if (value == colliderIndex) return;
+                if (value == colliderIndex || collider == null) return;
                if (value >= collider.Count || value < 0) return;

-                if (collider[colliderIndex].height<collider[value].height)
+                if (collider[colliderIndex].height < collider[value].height)
                {
                    Vector2 pos1 = collider[colliderIndex].SimPosition;
                    pos1.Y -= collider[colliderIndex].height * ColliderHeightFromFloor;