(9bec1c7ab) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:05:33 +03:00
parent 36ee088738
commit c1d1cf442f
12 changed files with 135 additions and 1118 deletions
@@ -1364,7 +1364,7 @@ namespace Barotrauma

            foreach (Hull hull in matchingHulls)
            {
-                if (string.IsNullOrEmpty(hull.RoomName))
+                if (string.IsNullOrEmpty(hull.RoomName) || !hull.RoomName.Contains("RoomName."))
                {
                    hull.RoomName = hull.CreateRoomName();
                }