Merge pull request #2 from Regalis11/master

v0.12.0.3
2021-02-17 19:59:47 -03:00
parent ec74cf912b 0697d7fc64
commit e6a76c79b7
4 changed files with 21 additions and 9 deletions
@@ -46,7 +46,11 @@ namespace Barotrauma
        {
            get
            {
-                yield return level.BeaconStation.WorldPosition;
+                if (level.BeaconStation == null)
+                {
+                    yield break;
+                }
+                yield return level.BeaconStation.WorldPosition;                
            }
        }

@@ -812,10 +812,12 @@ namespace Barotrauma.Items.Components
                if (e is Item projectileContainer)
                {
                    var container = projectileContainer.GetComponent<ItemContainer>();
-                    maxProjectileCount += container.Capacity;
-
-                    int projectiles = projectileContainer.ContainedItems.Count(it => it.Condition > 0.0f);
-                    usableProjectileCount += projectiles;                    
+                    if (container != null)
+                    {
+                        maxProjectileCount += container.Capacity;
+                        int projectiles = projectileContainer.ContainedItems.Count(it => it.Condition > 0.0f);
+                        usableProjectileCount += projectiles;   
+                    }                 
                }
            }