Fix main server threads being background threads, addresses #813

ClassiCube · Sep 13, 2024 · b16544a · b16544a
1 parent 8834938
commit b16544a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 1 deletion.
diff --git a/MCGalaxy/Commands/building/CmdImageprint.cs b/MCGalaxy/Commands/building/CmdImageprint.cs
@@ -107,6 +107,7 @@ bool DoImage(Player p, Vec3S32[] m, object state, BlockID block) {
             Thread thread;
             Server.StartThread(out thread, "ImagePrint",
                                () => DoDrawImage(p, m, (DrawArgs)state));
+            thread.IsBackground = true;
             return false;
         }
 

diff --git a/MCGalaxy/Games/RoundsGame/RoundsGame.cs b/MCGalaxy/Games/RoundsGame/RoundsGame.cs
@@ -84,6 +84,7 @@ public virtual void Start(Player p, string map, int rounds) {
 
             Thread thread;
             Server.StartThread(out thread, "Game_ " + GameName, RunGame);
+            thread.IsBackground = true;
         }
 
         /// <summary> Attempts to auto start this game with infinite rounds. </summary>

diff --git a/MCGalaxy/Levels/Level.Physics.cs b/MCGalaxy/Levels/Level.Physics.cs
@@ -58,6 +58,7 @@ public void StartPhysics() {
 
                 Server.StartThread(out physThread, "Physics_" + name, 
                                    PhysicsLoop);
+                physThread.IsBackground = true;
                 physThreadStarted = true;
             }
         }

diff --git a/MCGalaxy/Modules/Relay/RelayBot.cs b/MCGalaxy/Modules/Relay/RelayBot.cs
@@ -203,6 +203,7 @@ void IOThread() {
         void RunAsync() {
             Server.StartThread(out worker, RelayName + "_RelayBot", 
                                IOThread);
+            worker.IsBackground = true;
         }
 
         protected abstract void DoConnect();

diff --git a/MCGalaxy/Player/Player.Handlers.cs b/MCGalaxy/Player/Player.Handlers.cs
@@ -558,6 +558,7 @@ public void HandleCommand(string cmd, string args, CommandData data) {
 
                 Thread thread;
                 Server.StartThread(out thread, "CMD_ " + cmd, callback);
+                thread.IsBackground = true;
             } catch (Exception e) {
                 Logger.LogError(e);
                 Message("&WCommand failed");
@@ -584,6 +585,7 @@ public void HandleCommands(List<string> cmds, CommandData data) {
                 Thread thread;
                 Server.StartThread(out thread, "CMDS_", 
                                    () => UseCommands(commands, messages, data));
+                thread.IsBackground = true;
             } catch (Exception e) {
                 Logger.LogError(e);
                 Message("&WCommand failed.");

diff --git a/MCGalaxy/Server/Server.cs b/MCGalaxy/Server/Server.cs
@@ -344,7 +344,6 @@ public static void DoGC() {
         public static void StartThread(out Thread thread, string name, ThreadStart threadFunc) {
             thread = new Thread(threadFunc);
 
-            thread.IsBackground = true;
             try { thread.Name = name; } catch { }
             thread.Start();
         }

diff --git a/MCGalaxy/util/Threading/AsyncWorker.cs b/MCGalaxy/util/Threading/AsyncWorker.cs
@@ -68,6 +68,7 @@ void WakeupWorker() {
         public void RunAsync() {
             Thread worker;
             Server.StartThread(out worker, ThreadName, SendLoop);
+            worker.IsBackground = true;
         }
 
         public void StopAsync() {

diff --git a/MCGalaxy/util/UIHelpers.cs b/MCGalaxy/util/UIHelpers.cs
@@ -83,6 +83,7 @@ public static void HandleCommand(string text) {
                         Logger.Log(LogType.CommandUsage, "(console): FAILED COMMAND");
                     }
                 });
+            thread.IsBackground = true;
         }
 
         public static string Format(string message) {