Changeset 189 for binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

Timestamp:

Sep 12, 2014, 11:14:11 AM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs (modified) (3 diffs)

binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

@@ -28 +28 @@
                         Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
 
-                        object obj = netCommandQueue;
-                        Monitor.Enter (obj);
-                        try {
+                        lock (netCommandQueue) {
                                 isCurrentCommandFromClient = true;
                                 console.issuerOfCurrentClientCommand = _networkPlayer;
                                 console.ExecuteClientCmdInternal (_playerID, _command);
                                 isCurrentCommandFromClient = false;
-                        } finally {
-                                Monitor.Exit (obj);
                         }
 
@@ -61 +57 @@
                 {
                         if (netCommandQueue.Count > 0) {
-                                object obj = netCommandQueue;
-                                Monitor.Enter (obj);
-                                try {
+                                lock (netCommandQueue) {
                                         issuerOfCurrentCommand = netCommandQueue [0].client;
-                                        console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        try {
+                                                console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        } catch (Exception e) {
+                                                Log.Out("Exception while executing command: " + e);
+                                        }
                                         netCommandQueue.RemoveAt (0);
                                         issuerOfCurrentCommand = null;
-                                } finally {
-                                        Monitor.Exit (obj);
                                 }
                         }
@@ -76 +72 @@
                 public static void QueueNetCommand (string _line, IConnection _con)
                 {
-                        object obj = netCommandQueue;
-                        Monitor.Enter (obj);
-                        try {
+                        lock (netCommandQueue) {
                                 netCommandQueue.Add (new NetCommand (_line, _con));
-                        } finally {
-                                Monitor.Exit (obj);
                         }
                 }