From 5bf4daddec5c7b03f0a5702339fa574a101c5fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 22 Aug 2021 11:17:26 +0200
Subject: [PATCH] Set the default game name to the player name.

---
 OpenRA.Game/Server/Server.cs                            | 2 +-
 OpenRA.Game/Settings.cs                                 | 6 +++---
 OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index f1249a541a..fb67be5bb0 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -222,7 +222,7 @@ namespace OpenRA.Server
 			Type = type;
 			Settings = settings;
 
-			Settings.Name = OpenRA.Settings.SanitizedServerName(Settings.Name);
+			Settings.Name = Game.Settings.SanitizedServerName(Settings.Name);
 
 			ModData = modData;
 
diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs
index 75c24fa9c2..1b84007e2d 100644
--- a/OpenRA.Game/Settings.cs
+++ b/OpenRA.Game/Settings.cs
@@ -45,7 +45,7 @@ namespace OpenRA
 	public class ServerSettings
 	{
 		[Desc("Sets the server name.")]
-		public string Name = "OpenRA Game";
+		public string Name = "";
 
 		[Desc("Sets the internal port.")]
 		public int ListenPort = 1234;
@@ -404,11 +404,11 @@ namespace OpenRA
 			return clean;
 		}
 
-		public static string SanitizedServerName(string dirty)
+		public string SanitizedServerName(string dirty)
 		{
 			var clean = SanitizedName(dirty);
 			if (string.IsNullOrWhiteSpace(clean))
-				return new ServerSettings().Name;
+				return $"{SanitizedPlayerName(Player.Name)}'s Game";
 			else
 				return clean;
 		}
diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
index 172fa5028d..075e4e08bd 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
@@ -93,11 +93,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			}
 
 			var serverName = panel.Get<TextFieldWidget>("SERVER_NAME");
-			serverName.Text = Settings.SanitizedServerName(settings.Server.Name);
+			serverName.Text = Game.Settings.SanitizedServerName(settings.Server.Name);
 			serverName.OnEnterKey = _ => { serverName.YieldKeyboardFocus(); return true; };
 			serverName.OnLoseFocus = () =>
 			{
-				serverName.Text = Settings.SanitizedServerName(serverName.Text);
+				serverName.Text = Game.Settings.SanitizedServerName(serverName.Text);
 				settings.Server.Name = serverName.Text;
 			};
 
@@ -184,7 +184,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 		void CreateAndJoin()
 		{
-			var name = Settings.SanitizedServerName(panel.Get<TextFieldWidget>("SERVER_NAME").Text);
+			var name = Game.Settings.SanitizedServerName(panel.Get<TextFieldWidget>("SERVER_NAME").Text);
 			if (!Exts.TryParseIntegerInvariant(panel.Get<TextFieldWidget>("LISTEN_PORT").Text, out var listenPort))
 				listenPort = 1234;