Merge pull request #772 from starfi5h/pr-update

starfi5h · web-flow · commit 3cdf95c594a2 · 2026-04-22T01:15:17.000+08:00
Fix compatibility with game version 0.10.34.28518
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+0.9.22:
+- Compatible with game version 0.10.34.28518
+
 0.9.21:
 - Compatible with game version 0.10.34.28470
 
diff --git a/NebulaModel/Packets/Factory/KillEntityRequest.cs b/NebulaModel/Packets/Factory/KillEntityRequest.cs
@@ -4,12 +4,14 @@ public class KillEntityRequest
 {
     public KillEntityRequest() { }
 
-    public KillEntityRequest(int planetId, int objId)
+    public KillEntityRequest(int planetId, int objId, bool spawnPrebuild)
     {
         PlanetId = planetId;
         ObjId = objId;
+        SpawnPrebuild = spawnPrebuild;
     }
 
     public int PlanetId { get; set; }
     public int ObjId { get; set; }
+    public bool SpawnPrebuild { get; set; }
 }
diff --git a/NebulaNetwork/PacketProcessors/Factory/KillEntityRequestProcessor.cs b/NebulaNetwork/PacketProcessors/Factory/KillEntityRequestProcessor.cs
@@ -38,7 +38,7 @@ protected override void ProcessPacket(KillEntityRequest packet, NebulaConnection
             ref var entityPtr = ref factory.entityPool[packet.ObjId];
             if (entityPtr.id == packet.ObjId)
             {
-                factory.KillEntityFinally(GameMain.mainPlayer, packet.ObjId, ref CombatStat.empty);
+                factory.KillEntityFinally(GameMain.mainPlayer, packet.ObjId, ref CombatStat.empty, packet.SpawnPrebuild);
             }
 
             Multiplayer.Session.Factories.TargetPlanet = NebulaModAPI.PLANET_NONE;
diff --git a/NebulaPatcher/Patches/Dynamic/PlanetFactory_Patch.cs b/NebulaPatcher/Patches/Dynamic/PlanetFactory_Patch.cs
@@ -757,7 +757,7 @@ public static bool RemoveEnemyFinal_Prefix()
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(PlanetFactory.KillEntityFinally))]
-    public static bool KillEntityFinally_Prefix(PlanetFactory __instance, int objId)
+    public static bool KillEntityFinally_Prefix(PlanetFactory __instance, int objId, bool spawnPrebuild)
     {
         if (!Multiplayer.IsActive || objId <= 0)
         {
@@ -769,7 +769,7 @@ public static bool KillEntityFinally_Prefix(PlanetFactory __instance, int objId)
             return Multiplayer.Session.Factories.IsIncomingRequest.Value;
         }
 
-        var packet = new KillEntityRequest(__instance.planetId, objId);
+        var packet = new KillEntityRequest(__instance.planetId, objId, spawnPrebuild);
         var starId = __instance.planet.star.id;
         Multiplayer.Session.Server.SendPacketToStar(packet, starId);
         return true;
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.9.21",
+  "version": "0.9.22",
   "assemblyVersion": {
     "precision": "build"
   },

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,14 @@ public class KillEntityRequest`
`4`	`4`	`{`
`5`	`5`	`public KillEntityRequest() { }`
`6`	`6`
`7`		`- public KillEntityRequest(int planetId, int objId)`
	`7`	`+ public KillEntityRequest(int planetId, int objId, bool spawnPrebuild)`
`8`	`8`	`{`
`9`	`9`	`PlanetId = planetId;`
`10`	`10`	`ObjId = objId;`
	`11`	`+ SpawnPrebuild = spawnPrebuild;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`public int PlanetId { get; set; }`
`14`	`15`	`public int ObjId { get; set; }`
	`16`	`+ public bool SpawnPrebuild { get; set; }`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected override void ProcessPacket(KillEntityRequest packet, NebulaConnection`
`38`	`38`	`ref var entityPtr = ref factory.entityPool[packet.ObjId];`
`39`	`39`	`if (entityPtr.id == packet.ObjId)`
`40`	`40`	`{`
`41`		`- factory.KillEntityFinally(GameMain.mainPlayer, packet.ObjId, ref CombatStat.empty);`
	`41`	`+ factory.KillEntityFinally(GameMain.mainPlayer, packet.ObjId, ref CombatStat.empty, packet.SpawnPrebuild);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`Multiplayer.Session.Factories.TargetPlanet = NebulaModAPI.PLANET_NONE;`
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ public static bool RemoveEnemyFinal_Prefix()`
`757`	`757`
`758`	`758`	`[HarmonyPrefix]`
`759`	`759`	`[HarmonyPatch(nameof(PlanetFactory.KillEntityFinally))]`
`760`		`- public static bool KillEntityFinally_Prefix(PlanetFactory __instance, int objId)`
	`760`	`+ public static bool KillEntityFinally_Prefix(PlanetFactory __instance, int objId, bool spawnPrebuild)`
`761`	`761`	`{`
`762`	`762`	`if (!Multiplayer.IsActive \|\| objId <= 0)`
`763`	`763`	`{`
`@@ -769,7 +769,7 @@ public static bool KillEntityFinally_Prefix(PlanetFactory __instance, int objId)`
`769`	`769`	`return Multiplayer.Session.Factories.IsIncomingRequest.Value;`
`770`	`770`	`}`
`771`	`771`
`772`		`- var packet = new KillEntityRequest(__instance.planetId, objId);`
	`772`	`+ var packet = new KillEntityRequest(__instance.planetId, objId, spawnPrebuild);`
`773`	`773`	`var starId = __instance.planet.star.id;`
`774`	`774`	`Multiplayer.Session.Server.SendPacketToStar(packet, starId);`
`775`	`775`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "0.9.21",`
	`3`	`+ "version": "0.9.22",`
`4`	`4`	`"assemblyVersion": {`
`5`	`5`	`"precision": "build"`
`6`	`6`	`},`