Unstable 1.8.4.0

This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
@@ -160,7 +160,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);
@@ -241,7 +243,7 @@ namespace Barotrauma
maxPlayers,
ownerKey,
ownerEndpoint);
Server.StartServer();
Server.StartServer(registerToServerList: true);
for (int i = 0; i < CommandLineArgs.Length; i++)
{
@@ -275,6 +277,12 @@ namespace Barotrauma
}
i++;
break;
case "-multiclienttestmode":
#if DEBUG
CharacterCampaignData.RequireClientNameMatch = true;
#endif
i++;
break;
}
}
}