f8b0295...0671290

Barotrauma/BarotraumaShared/Source/Map/Map/LocationType.cs

@@ -89,7 +89,9 @@ namespace Barotrauma
                 }
                 CommonnessPerZone[zoneIndex] = zoneCommonness;
             }
-            catch (Exception e)
+
+            hireableJobs = new List<Tuple<JobPrefab, float>>();
+            foreach (XElement subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {

Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs

@@ -269,9 +269,6 @@ namespace Barotrauma
                 }
             }
 
-            //remove orphans
-            Locations.RemoveAll(c => !connectedLocations.Contains(c));
-            
             for (int i = connections.Count - 1; i >= 0; i--)
             {
                 i = Math.Min(i, connections.Count - 1);
@@ -428,7 +425,6 @@ namespace Barotrauma
                 GameAnalyticsManager.AddErrorEventOnce("Map.SelectLocation:LocationNotFound", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
                 return;
             }
-            CurrentLocation.SelectedMissionIndex = missionIndex;
 
             SelectedLocation = location;
             SelectedConnection = connections.Find(c => c.Locations.Contains(CurrentLocation) && c.Locations.Contains(SelectedLocation));

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -134,7 +134,7 @@ namespace Barotrauma
 
         public HashSet<string> Tags
         {
-            get { return prefab; }
+            get { return prefab.Tags; }
         }
         
         protected Color spriteColor;

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -523,30 +523,6 @@ namespace Barotrauma
                 {
                     maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
                 }
-                else
-                {
-                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
-                }
-            }
-            
-            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
-            {
-                //no walls found at either side, just use the initial spawnpos and hope for the best
-            }
-            else if (minX < 0)
-            {
-                //no wall found at the left side, spawn to the left from the right-side wall
-                spawnPos.X = maxX - minWidth - 100.0f;
-            }
-            else if (maxX > Level.Loaded.Size.X)
-            {
-                //no wall found at right side, spawn to the right from the left-side wall
-                spawnPos.X = minX + minWidth + 100.0f;
-            }
-            else
-            {
-                //walls found at both sides, use their midpoint
-                spawnPos.X = (minX + maxX) / 2;
             }
             
             if (minX < 0.0f && maxX > Level.Loaded.Size.X)
@@ -1016,26 +992,6 @@ namespace Barotrauma
             return closest;
         }
 
-        public List<Hull> GetHulls(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Hull.hullList);
-        public List<Gap> GetGaps(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Gap.GapList);
-        public List<Item> GetItems(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Item.ItemList);
-
-        public List<T> GetEntities<T>(bool includingConnectedSubs, List<T> list) where T : MapEntity
-        {
-            return list.FindAll(e => IsEntityFoundOnThisSub(e, includingConnectedSubs));
-        }
-
-        public bool IsEntityFoundOnThisSub(MapEntity entity, bool includingConnectedSubs)
-        {
-            if (entity.Submarine == this) { return true; }
-            if (entity.Submarine == null) { return false; }
-            if (includingConnectedSubs)
-            {
-                return GetConnectedSubs().Any(s => s == entity.Submarine && entity.Submarine.TeamID == TeamID);
-            }
-            return false;
-        }
-
         /// <summary>
         /// Returns true if the sub is same as the other.
         /// </summary>

Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs

@@ -700,6 +700,23 @@ namespace Barotrauma
             Vector2 impulse = direction * impact * 0.5f;            
             impulse = impulse.ClampLength(5.0f);
 
+            if (!MathUtils.IsValid(impulse))
+            {
+                string errorMsg =
+                    "Invalid impulse in SubmarineBody.ApplyImpact: " + impulse +
+                    ". Direction: " + direction + ", body position: " + Body.SimPosition + ", impact: " + impact + ".";
+                if (GameMain.NetworkMember != null)
+                {
+                    errorMsg += GameMain.NetworkMember.IsClient ? " Playing as a client." : " Hosting a server.";
+                }
+                if (GameSettings.VerboseLogging) DebugConsole.ThrowError(errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce(
+                    "SubmarineBody.ApplyImpact:InvalidImpulse",
+                    GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
+                    errorMsg);
+                return;
+            }
+
 #if CLIENT
             if (Character.Controlled != null && Character.Controlled.Submarine == submarine)
             {