Fixes #1396 (#1508)

OpenDreamProject · Oct 16, 2023 · 11a64a5 · 11a64a5
1 parent e41e780
commit 11a64a5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/OpenDreamRuntime/DreamManager.Connections.cs b/OpenDreamRuntime/DreamManager.Connections.cs
@@ -122,7 +122,16 @@ private async Task ConsumeAndHandleWorldTopicSocket(Socket remote, CancellationT
 
                         var remoteAddress = (remote.RemoteEndPoint as IPEndPoint)!.Address.ToString();
                         _sawmill.Debug($"World Topic #{topicId}: '{remoteAddress}' -> '{topic}'");
-                        var topicResponse = WorldInstance.SpawnProc("Topic", null, new DreamValue(topic), new DreamValue(remoteAddress));
+                        var tcs = new TaskCompletionSource<DreamValue>();
+                        DreamThread.Run("Topic Handler", async state => {
+                            var topicProc = WorldInstance.GetProc("Topic");
+
+                            var result = await state.Call(topicProc, WorldInstance, null, new DreamValue(topic), new DreamValue(remoteAddress));
+                            tcs.SetResult(result);
+                            return result;
+                        });
+
+                        var topicResponse = await tcs.Task;
                         if (topicResponse.IsNull) {
                             return;
                         }