From 4eaf64709bca87a2c35494c00ef97656d162417c Mon Sep 17 00:00:00 2001
From: Deathmax <death@deathmax.tk>
Date: Wed, 30 May 2012 10:18:44 +0800
Subject: [PATCH] Re-add ServerNickname and copies it to ServerName

---
 TShockAPI/ConfigFile.cs | 2 ++
 TShockAPI/TShock.cs     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index 6357bf26..3113800e 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -132,6 +132,8 @@ namespace TShockAPI
 		[Description("This will turn on a token requirement for the /status API endpoint.")] public bool
 			EnableTokenEndpointAuthentication;
 
+        [Description("Deprecated. Use ServerName instead.")] public string ServerNickname = "TShock Server";
+
 		[Description("Enable/Disable the rest api.")] public bool RestApiEnabled;
 
 		[Description("This is the port which the rest api will listen on.")] public int RestApiPort = 7878;
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 0a75e3c8..4324c0a7 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1590,6 +1590,8 @@ namespace TShockAPI
 			RconHandler.ListenPort = file.RconPort;
 
 			Utils.HashAlgo = file.HashAlgorithm;
+
+            file.ServerName = file.ServerNickname;
 		}
 	}
 }