Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2025-04-10 10:37:09 -03:00
parent fdfc3a77f3 38cce0c933
commit 103871a4e9
296 changed files with 8420 additions and 2945 deletions
@@ -167,7 +167,9 @@ namespace Barotrauma
            }
            else
            {
-                name = doc.Root.GetAttributeString(nameof(ServerSettings.Name), "Server");
+                name = doc.Root.GetAttributeString(nameof(ServerSettings.ServerName),
+                    //backwards compatibility
+                    doc.Root.GetAttributeString("name", "Server"));
                port = doc.Root.GetAttributeInt(nameof(ServerSettings.Port), NetConfig.DefaultPort);
                queryPort = doc.Root.GetAttributeInt(nameof(ServerSettings.QueryPort), NetConfig.DefaultQueryPort);
                publiclyVisible = doc.Root.GetAttributeBool(nameof(ServerSettings.IsPublic), false);
@@ -289,6 +291,12 @@ namespace Barotrauma
                        }
                        i++;
                        break;
+                    case "-multiclienttestmode":
+#if DEBUG
+                        CharacterCampaignData.RequireClientNameMatch = true;
+#endif
+                        i++;
+                        break;
                }
            }
        }