From 4f34e9b53ac8fa79352cc8d8a395e903d0504827 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 20 Aug 2020 17:59:51 -0400
Subject: [PATCH] DMAPI Topic before initialization patch

---
 build/Version.props                                    |  2 +-
 src/DMAPI/tgs.dm                                       |  2 +-
 src/DMAPI/tgs/v5/api.dm                                | 10 ++++++++--
 .../Components/Interop/DMApiConstants.cs               |  4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index e96b43801a..f4ea0cd426 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -6,7 +6,7 @@
     <TgsConfigVersion>2.1.0</TgsConfigVersion>
     <TgsApiVersion>7.3.0</TgsApiVersion>
     <TgsClientVersion>8.3.0</TgsClientVersion>
-    <TgsDmapiVersion>5.2.3</TgsDmapiVersion>
+    <TgsDmapiVersion>5.2.4</TgsDmapiVersion>
     <TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
     <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
   </PropertyGroup>
diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index 35d9dbefbd..5a143b391a 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.3"
+#define TGS_DMAPI_VERSION "5.2.4"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm
index 3cd47ec1a6..524ca1a3c3 100644
--- a/src/DMAPI/tgs/v5/api.dm
+++ b/src/DMAPI/tgs/v5/api.dm
@@ -15,8 +15,10 @@
 	var/datum/tgs_revision_information/revision
 	var/list/chat_channels
 
+	var/initialized = FALSE
+
 /datum/tgs_api/v5/ApiVersion()
-	return new /datum/tgs_version("5.2.3")
+	return new /datum/tgs_version("5.2.4")
 
 /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
 	server_port = world.params[DMAPI5_PARAM_SERVER_PORT]
@@ -79,6 +81,7 @@
 	chat_channels = list()
 	DecodeChannels(runtime_information)
 
+	initialized = TRUE
 	return TRUE
 
 /datum/tgs_api/v5/proc/RequireInitialBridgeResponse()
@@ -95,10 +98,13 @@
 	return json_encode(response)
 
 /datum/tgs_api/v5/OnTopic(T)
+	if(!initialized)
+		return FALSE	//continue world/Topic
+
 	var/list/params = params2list(T)
 	var/json = params[DMAPI5_TOPIC_DATA]
 	if(!json)
-		return FALSE	//continue world/Topic
+		return FALSE
 
 	var/list/topic_parameters = json_decode(json)
 	if(!topic_parameters)
diff --git a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs
index 1dc6e31381..fa90ef4045 100644
--- a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs
+++ b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using System;
 using Tgstation.Server.Host.Components.Interop.Converters;
@@ -33,7 +33,7 @@ namespace Tgstation.Server.Host.Components.Interop
 		/// <summary>
 		/// The DMAPI <see cref="Version"/> being used.
 		/// </summary>
-		public static readonly Version Version = new Version(5, 2, 3);
+		public static readonly Version Version = new Version(5, 2, 4);
 
 		/// <summary>
 		/// <see cref="JsonSerializerSettings"/> for use when communicating with the DMAPI.