Merge pull request #542 from starfi5h/pr-fixPR536

Fix UpdateDirtyMeshes error, ILS desync

Author: starfi5h

NebulaNetwork/PacketProcessors/Planet/FactoryDataProcessor.cs

@@ -22,21 +22,13 @@ public override void ProcessPacket(FactoryData packet, NebulaConnection conn)
 
             PlanetData planet = GameMain.galaxy.PlanetById(packet.PlanetId);
             Multiplayer.Session.Planets.PendingFactories.Add(packet.PlanetId, packet.BinaryData);
+            Multiplayer.Session.Planets.PendingTerrainData.Add(packet.PlanetId, packet.TerrainModData);
             Log.Info($"Parsing {packet.BinaryData.Length} bytes of data for factory {planet.name} (ID: {planet.id})");
 
             lock (PlanetModelingManager.fctPlanetReqList)
             {
                 PlanetModelingManager.fctPlanetReqList.Enqueue(planet);
             }
-
-            // Apply terrian changes, code from PlanetFactory.FlattenTerrainReform()
-            planet.data.modData = packet.TerrainModData;
-            for (int i = 0; i < planet.dirtyFlags.Length; i++)
-            {
-                planet.dirtyFlags[i] = true;
-            }
-            planet.landPercentDirty = true;
-            planet.UpdateDirtyMeshes();
         }
     }
 }

NebulaPatcher/Patches/Dynamic/GalacticTransport_Patch.cs

@@ -19,10 +19,15 @@ public static void SetForNewGame_Postfix()
 
         [HarmonyPrefix]
         [HarmonyPatch(nameof(GalacticTransport.AddStationComponent))]
-        public static bool AddStationComponent_Prefix()
+        public static bool AddStationComponent_Prefix(StationComponent station)
         {
-            // We will let host decide the value of gid, so client only add when the packet arrives
-            return !Multiplayer.IsActive || Multiplayer.Session.LocalPlayer.IsHost || Multiplayer.Session.Ships.PatchLockILS;
+            if (Multiplayer.IsActive && Multiplayer.Session.LocalPlayer.IsClient && station.gid == 0)
+            {
+                // When client build a new station (gid == 0), we will let host decide the value of gid
+                // ILS will be added when ILSAddStationComponent from host arrived
+                return false;
+            }            
+            return true;
         }
 
         [HarmonyPrefix]

NebulaPatcher/Patches/Dynamic/GameData_Patch.cs

@@ -6,7 +6,7 @@
 using NebulaModel.Packets.Players;
 using NebulaPatcher.Patches.Transpilers;
 using NebulaWorld;
-using System.Collections.Generic;
+using System;
 using UnityEngine;
 
 namespace NebulaPatcher.Patches.Dynamic
@@ -141,6 +141,27 @@ public static bool OnActivePlanetFactoryLoaded_Prefix(GameData __instance, Plane
                     Log.Info($"OnActivePlanetLoaded: Resume PacketProcessor");
                 }
 
+                // Get the recieved bytes from the remote server that we will import
+                if (Multiplayer.Session.Planets.PendingTerrainData.TryGetValue(planet.id, out byte[] terrainBytes))
+                {
+                    // Apply terrian changes, code from PlanetFactory.FlattenTerrainReform()
+                    planet.data.modData = terrainBytes;
+                    for (int i = 0; i < planet.dirtyFlags.Length; i++)
+                    {
+                        planet.dirtyFlags[i] = true;
+                    }
+                    planet.landPercentDirty = true;
+                    try
+                    {
+                        planet.UpdateDirtyMeshes();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error(e);
+                    }
+                    Multiplayer.Session.Planets.PendingTerrainData.Remove(planet.id);
+                }
+
                 NebulaModAPI.OnPlanetLoadFinished?.Invoke(planet.id);
             }
 

NebulaWorld/Planet/PlanetManager.cs

@@ -7,17 +7,20 @@ namespace NebulaWorld.Planet
     public class PlanetManager : IDisposable
     {
         public Dictionary<int, byte[]> PendingFactories { get; private set; }
+        public Dictionary<int, byte[]> PendingTerrainData { get; private set; }
 
         public readonly ToggleSwitch IsIncomingRequest = new ToggleSwitch();
 
         public PlanetManager()
         {
             PendingFactories = new Dictionary<int, byte[]>();
+            PendingTerrainData = new Dictionary<int, byte[]>();
         }
 
         public void Dispose()
         {
             PendingFactories = null;
+            PendingTerrainData = null;
         }
     }
 }