Ensure BvServer messages are always cleared

ZachHembree · Dec 1, 2020 · e0dd4b7 · e0dd4b7
1 parent 8db5fd3
commit e0dd4b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/BuildVision2/Data/Scripts/BuildVision2/API/BvAPIMaster.cs b/BuildVision2/Data/Scripts/BuildVision2/API/BvAPIMaster.cs
@@ -96,14 +96,17 @@ private void ClientHandler(object message)
 
         private object GetOrSetMembers(object data, int memberEnum)
         {
-            switch ((BvApiAccessors)memberEnum)
+            if (BvMain.Instance?.CanUpdate ?? false)
             {
-                case BvApiAccessors.Open:
-                    return PropertiesMenu.Open;
-                case BvApiAccessors.MenuMode:
-                    return PropertiesMenu.MenuMode;
-                case BvApiAccessors.Target:
-                    return PropertiesMenu.Target?.TBlock;
+                switch ((BvApiAccessors)memberEnum)
+                {
+                    case BvApiAccessors.Open:
+                        return PropertiesMenu.Open;
+                    case BvApiAccessors.MenuMode:
+                        return PropertiesMenu.MenuMode;
+                    case BvApiAccessors.Target:
+                        return PropertiesMenu.Target?.TBlock;
+                }
             }
 
             return null;

diff --git a/BuildVision2/Data/Scripts/BuildVision2/BvServer.cs b/BuildVision2/Data/Scripts/BuildVision2/BvServer.cs
@@ -135,10 +135,9 @@ private void SendServerMessages()
                     MyAPIGateway.Multiplayer.SendMessageToServer(serverHandlerID, protoMessages);
                 else
                     ExceptionHandler.WriteLineAndConsole($"Unable to serialize server message: {exception.ToString()}");
-            }
 
-            if (!ExceptionHandler.IsServer)
                 serverMessages.Clear();
+            }
         }
 
         /// <summary>