Merge pull request #13908 from Citadel-Station-13/tgs-dmapi-update

Automatic TGS DMAPI Update
2020-12-29 01:28:12 -07:00
parent 3ba7740641 14cefb2d35
commit 2e071b1e0b
2 changed files with 15 additions and 14 deletions
@@ -98,18 +98,19 @@
 	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
+		return FALSE // continue to /world/Topic

 	var/list/topic_parameters = json_decode(json)
 	if(!topic_parameters)
 		return TopicResponse("Invalid topic parameters json!");

+	if(!initialized)
+		TGS_WARNING_LOG("Missed topic due to not being initialized: [T]")
+		return TRUE	// too early to handle, but it's still our responsibility
+
 	var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER]
 	if(their_sCK != access_identifier)
 		return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER] from: [json]!");