Minor fixes to client mod

Author: rexxar-tc

Torch.Mod/ModCommunication.cs

@@ -148,6 +148,10 @@ public static void SendMessageTo(MessageBase message, ulong target)
         {
             if (!MyAPIGateway.Multiplayer.IsServer)
                 throw new Exception("Only server can send targeted messages");
+
+            if (_closing)
+                return;
+
             message.Target = target;
             message.TargetType = MessageTarget.Single;
             MyLog.Default.WriteLineAndConsole($"Sending message of type {message.GetType().FullName}");
@@ -159,15 +163,23 @@ public static void SendMessageToClients(MessageBase message)
         {
             if (!MyAPIGateway.Multiplayer.IsServer)
                 throw new Exception("Only server can send targeted messages");
+
+            if (_closing)
+                return;
+
             message.TargetType = MessageTarget.AllClients;
             _outgoing.Enqueue(message);
             ReleaseLock();
         }
 
         public static void SendMessageExcept(MessageBase message, params ulong[] ignoredUsers)
         {
-            if (MyAPIGateway.Multiplayer.IsServer)
+            if (!MyAPIGateway.Multiplayer.IsServer)
                 throw new Exception("Only server can send targeted messages");
+
+            if (_closing)
+                return;
+
             message.TargetType = MessageTarget.AllExcept;
             message.Ignore = ignoredUsers;
             _outgoing.Enqueue(message);
@@ -176,27 +188,26 @@ public static void SendMessageExcept(MessageBase message, params ulong[] ignored
 
         public static void SendMessageToServer(MessageBase message)
         {
+            if (_closing)
+                return;
+
             message.TargetType = MessageTarget.Server;
             _outgoing.Enqueue(message);
             ReleaseLock();
         }
 
         private static void ReleaseLock()
         {
-            if(_lock==null)
-                return;
-            while(!_lock.TryAcquireExclusive())
-                _lock.ReleaseExclusive();
-            _lock.ReleaseExclusive();
+            while(_lock?.TryAcquireExclusive() == false)
+                _lock?.ReleaseExclusive();
+            _lock?.ReleaseExclusive();
         }
 
         private static void AcquireLock()
         {
-            if (_lock == null)
-                return;
             ReleaseLock();
-            _lock.AcquireExclusive();
-            _lock.AcquireExclusive();
+            _lock?.AcquireExclusive();
+            _lock?.AcquireExclusive();
         }
     }
 }

Torch.Mod/TorchModCore.cs

@@ -24,7 +24,14 @@ public override void UpdateAfterSimulation()
 
         protected override void UnloadData()
         {
-            ModCommunication.Unregister();
+            try
+            {
+                ModCommunication.Unregister();
+            }
+            catch
+            {
+                //session unloading, don't care
+            }
         }
     }
 }