From e367cea8405654dbea0fb3e87040d7ad6605ea42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 4 Jan 2014 09:34:17 +0100
Subject: [PATCH] one MOTD for all mods and create a default motd.txt

---
 CHANGELOG                    |  2 ++
 OpenRA.Game/Server/Server.cs | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e8aa0085b7..a439780d9b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,8 @@ NEW:
 		Added GainsUnitUpgrades trait for leveling specific unit upgrades - firepower, armor, speed.
 		Added support for crates to level up specific unit upgrades.
 		Added a new Launch.Replay=$FILEPATH parameter for OpenRA.Game.exe to instantly start watching a *.rep file.
+	Server:
+		Message of the day is now shared between all mods and a default motd.txt gets created in the user directory.
 	Asset Browser:
 		Filenames are now listed in alphabetical order
 	Map Editor:
diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index 547699f1e9..8e5781d691 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -328,11 +328,14 @@ namespace OpenRA.Server
 				// Send initial ping
 				SendOrderTo(newConn, "Ping", Environment.TickCount.ToString());
 
-				var motdPath = Path.Combine(Platform.SupportDir, "motd_{0}.txt".F(ModData.Manifest.Mod.Id));
-				if (File.Exists(motdPath))
+				if (Settings.Dedicated)
 				{
-					var motd = System.IO.File.ReadAllText(motdPath);
-					SendOrderTo(newConn, "Message", motd);
+					var motdFile = Path.Combine(Platform.SupportDir, "motd.txt");
+					if (!File.Exists(motdFile))
+						System.IO.File.WriteAllText(motdFile, "Welcome, have fun and good luck!");
+					var motd = System.IO.File.ReadAllText(motdFile);
+					if (!string.IsNullOrEmpty(motd))
+						SendOrderTo(newConn, "Message", motd);
 				}
 
 				if (handshake.Mod == "{DEV_VERSION}")