fix two bugs in multiplayer support

sync the dequeue method sync Tree initialization
fluffy-mods · Jan 28, 2020 · 0e10dd1 · 0e10dd1
1 parent ee07c06
commit 0e10dd1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Assemblies/ResearchTree.dll b/Assemblies/ResearchTree.dll
diff --git a/Source/Extensions/SyncWorker_ResearchNode.cs b/Source/Extensions/SyncWorker_ResearchNode.cs
@@ -14,7 +14,6 @@ public class SyncWorker_ResearchNode
         [SyncWorker]
         static void SyncResearchNode( SyncWorker worker, ref ResearchNode node )
         {
-
             Log.Debug( $"Syncing" );
             if ( worker.isWriting )
             {
@@ -29,7 +28,6 @@ static void SyncResearchNode( SyncWorker worker, ref ResearchNode node )
             }
         }
 
-
         [SyncWorker]
         static void SyncResearchNodes( SyncWorker worker, ref IEnumerable<ResearchNode> nodes )
         {

diff --git a/Source/Graph/Tree.cs b/Source/Graph/Tree.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using Multiplayer.API;
 using UnityEngine;
 using Verse;
 using static FluffyResearchTree.Constants;
@@ -72,8 +73,11 @@ public static List<Edge<Node,Node>> Edges
         }
 
         private static bool _initializing = false;
+        [SyncMethod]
         public static void Initialize()
         {
+            if ( Initialized ) return;
+
             // make sure we only have one initializer running
             if (_initializing)
                 return;
@@ -105,7 +109,7 @@ public static void Initialize()
             // done!
             LongEventHandler.QueueLongEvent( () => { Initialized = true; }, "Fluffy.ResearchTree.PreparingTree.Layout", false, null );
 
-            // tell researh tab we're ready
+            // tell research tab we're ready
             LongEventHandler.QueueLongEvent( MainTabWindow_ResearchTree.Instance.Notify_TreeInitialized, "Fluffy.ResearchTree.RestoreQueue", false, null);
 
         }

diff --git a/Source/Queue/Queue.cs b/Source/Queue/Queue.cs
@@ -58,6 +58,7 @@ public static void TryDequeue( ResearchNode node )
                 Dequeue( node );
         }
 
+        [SyncMethod]
         public static void Dequeue( ResearchNode node )
         {
             // remove this node