Fix desync by GameData.CreateDysonSphere

NebulaModTeam · Mar 22, 2024 · 3ef47e4 · 3ef47e4
1 parent 10a0027
commit 3ef47e4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/NebulaNetwork/PacketProcessors/Universe/DysonSphereStatusProcessor.cs b/NebulaNetwork/PacketProcessors/Universe/DysonSphereStatusProcessor.cs
@@ -19,8 +19,10 @@ protected override void ProcessPacket(DysonSphereStatusPacket packet, NebulaConn
         {
             return;
         }
+        // Replace some values set in DysonSphere.BeforeGameTick
         dysonSphere.grossRadius = packet.GrossRadius;
         dysonSphere.energyReqCurrentTick = packet.EnergyReqCurrentTick;
         dysonSphere.energyGenCurrentTick = packet.EnergyGenCurrentTick;
+        dysonSphere.energyGenOriginalCurrentTick = (long)(dysonSphere.energyGenCurrentTick / dysonSphere.energyDFHivesDebuffCoef);
     }
 }
diff --git a/NebulaPatcher/Patches/Dynamic/GameData_Patch.cs b/NebulaPatcher/Patches/Dynamic/GameData_Patch.cs
@@ -464,4 +464,38 @@ private static void RefreshMissingMeshes()
             Log.Debug("RefreshMissingMeshes");
         }
     }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(GameData.CreateDysonSphere))]
+    public static bool CreateDysonSphere_Prefix(GameData __instance, int starIndex, ref DysonSphere __result)
+    {
+        if (!Multiplayer.IsActive || Multiplayer.Session.IsServer) return true;
+
+
+        if ((ulong)starIndex >= (ulong)((long)__instance.galaxy.starCount))
+        {
+            __result = null;
+            return false;
+        }
+        if (__instance.dysonSpheres[starIndex] != null)
+        {
+            __result = __instance.dysonSpheres[starIndex];
+            return false;
+        }
+
+        // Create a dummy dyson sphere and prevent sending packets
+        Multiplayer.Session.DysonSpheres.InBlueprint = true;
+        __instance.dysonSpheres[starIndex] = new DysonSphere();
+        __instance.dysonSpheres[starIndex].Init(__instance, __instance.galaxy.stars[starIndex]);
+        __instance.dysonSpheres[starIndex].ResetNew();
+        Multiplayer.Session.DysonSpheres.InBlueprint = false;
+
+        if (Multiplayer.Session.DysonSpheres.RequestingIndex == -1)
+        {
+            // If client is not requesting yet, request the target sphere from server
+            Multiplayer.Session.DysonSpheres.RequestDysonSphere(starIndex, false);
+        }
+        __result = __instance.dysonSpheres[starIndex];
+        return false;
+    }
 }