Merge pull request #22 from hubastard/master

branch update
Baldie-dev · Apr 12, 2021 · 7884ea8 · 7884ea8
2 parents bcd5047 + b10541d
commit 7884ea8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/NebulaHost/MultiplayerHostSession.cs b/NebulaHost/MultiplayerHostSession.cs
@@ -43,6 +43,7 @@ public void StartServer(int port, bool loadSaveFile = false)
             {
                 SaveManager.LoadServerData();
             }
+            SaveManager.SaveOnExit = true;
             PacketProcessor = new NetPacketProcessor();
             StatisticsManager = new StatisticsManager();
 
@@ -158,7 +159,10 @@ protected override void OnClose(CloseEventArgs e)
                     return;
 
                 NebulaModel.Logger.Log.Info($"Client disconnected: {Context.UserEndPoint}, reason: {e.Reason}");
-                playerManager.PlayerDisconnected(new NebulaConnection(Context.WebSocket, Context.UserEndPoint, packetProcessor));
+                UnityDispatchQueue.RunOnMainThread(() =>
+                {
+                    playerManager.PlayerDisconnected(new NebulaConnection(Context.WebSocket, Context.UserEndPoint, packetProcessor));
+                });
             }
 
             protected override void OnError(ErrorEventArgs e)

diff --git a/NebulaHost/PacketProcessors/Factory/Entity/CreatePrebuildsRequestProcessor.cs b/NebulaHost/PacketProcessors/Factory/Entity/CreatePrebuildsRequestProcessor.cs
@@ -44,6 +44,10 @@ public void ProcessPacket(CreatePrebuildsRequest packet, NebulaConnection conn)
                     planet.physics = new PlanetPhysics(planet);
                     planet.physics.Init();
                 }
+                if (AccessTools.Field(typeof(CargoTraffic), "beltRenderingBatch").GetValue(planet.factory.cargoTraffic) == null)
+                {
+                    planet.factory.cargoTraffic.CreateRenderingBatches();
+                }
                 pab.CreatePrebuilds();
                 FactoryManager.EventFromServer = false;
                 FactoryManager.EventFactory = null;

diff --git a/NebulaHost/SaveManager.cs b/NebulaHost/SaveManager.cs
@@ -12,6 +12,7 @@ public class SaveManager
         private const string FILE_EXTENSION = ".server";
         private static string lastFileName = "";
 
+        public static bool SaveOnExit = false;
         public static void SaveServerData(string saveName)
         {
             string path = GameConfig.gameSaveFolder + saveName + FILE_EXTENSION;
@@ -27,7 +28,7 @@ public static void SaveServerData(string saveName)
                 data.Value.Serialize(netDataWriter);
             }
             //Add host's data
-            netDataWriter.Put(CryptoUtils.GetCurrentUserPublicKeyHash());
+            netDataWriter.Put(CryptoUtils.GetCurrentUserPublicKeyHash()); 
             LocalPlayer.Data.Serialize(netDataWriter);
 
             File.WriteAllBytes(path, netDataWriter.Data);

diff --git a/NebulaModel/Networking/NebulaConnection.cs b/NebulaModel/Networking/NebulaConnection.cs
@@ -28,7 +28,7 @@ public NebulaConnection(WebSocket peerSocket, IPEndPoint peerEndpoint, NetPacket
             }
             else
             {
-                Log.Warn($"Cannot send packet {packet?.GetType()} to a closed connection {peerSocket?.Url}");
+                Log.Warn($"Cannot send packet {packet?.GetType()} to a closed connection {peerEndpoint}");
             }
         }
 

diff --git a/NebulaPatcher/Patches/Dynamic/GameSave_Patch.cs b/NebulaPatcher/Patches/Dynamic/GameSave_Patch.cs
@@ -11,9 +11,10 @@ class GameSave_Patch
         [HarmonyPatch("SaveCurrentGame")]
         public static bool SaveCurrentGame_Prefix(string saveName)
         {
-            if (SimulatedWorld.Initialized && LocalPlayer.IsMasterClient)
+            if (SaveManager.SaveOnExit || SimulatedWorld.Initialized && LocalPlayer.IsMasterClient)
             {
                 SaveManager.SaveServerData(saveName);
+                SaveManager.SaveOnExit = false;
             }
 
             if (SimulatedWorld.Initialized && !LocalPlayer.IsMasterClient)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    Log.Warn($"Cannot send packet {packet?.GetType()} to a closed connection {peerSocket?.Url}");
+                    Log.Warn($"Cannot send packet {packet?.GetType()} to a closed connection {peerEndpoint}");
                 }
             }
@@ Expand Down @@