Merge pull request #81 from RimNauts/main

Fix issue with tileless maps
RimNauts · Apr 13, 2024 · 101402f · 101402f
2 parents f7b7250 + b90bf3b
commit 101402f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/Assemblies/RimNauts2.dll b/Assemblies/RimNauts2.dll
diff --git a/Changelog.md b/Changelog.md
@@ -1 +1,2 @@
 # Changelog
+- Fix issue with tileless maps
diff --git a/Source/RimNauts2/RimNauts2/Biome/Patch/PawnGroupMaker.cs b/Source/RimNauts2/RimNauts2/Biome/Patch/PawnGroupMaker.cs
@@ -6,6 +6,8 @@ namespace RimNauts2.Biome.Patch {
     [HarmonyLib.HarmonyPatch(typeof(RimWorld.PawnGroupMakerUtility), "GeneratePawns")]
     class PawnGroupMakerUtility_GeneratePawns {
         public static IEnumerable<Pawn> Postfix(IEnumerable<Pawn> __result, RimWorld.PawnGroupMakerParms parms, bool warnOnZeroResults) {
+            if (parms.tile == -1) return __result;
+
             RimWorld.BiomeDef biome = Find.WorldGrid[parms.tile].biome;
             bool no_oxygen = Universum.Utilities.Cache.allowed_utility(biome, "universum.vacuum_suffocation");
             bool decompression = Universum.Utilities.Cache.allowed_utility(biome, "universum.vacuum_decompression");

diff --git a/Source/RimNauts2/RimNauts2/Constants.cs b/Source/RimNauts2/RimNauts2/Constants.cs
@@ -1,7 +1,7 @@
 namespace RimNauts2 {
     public static class Info {
         public static readonly string name = "RimNauts 2";
-        public static readonly string version = "5.2.1";
+        public static readonly string version = "5.2.2";
     }
 
     public static class Style {

diff --git a/Source/RimNauts2/RimNauts2/Things/TransportPod.cs b/Source/RimNauts2/RimNauts2/Things/TransportPod.cs
@@ -72,7 +72,7 @@ public bool get_tile_target(RimWorld.Planet.GlobalTargetInfo target) {
         }
 
         public bool CanSelectCelestialObject(RimWorld.Planet.GlobalTargetInfo target) {
-            if (!target.IsValid) return false;
+            if (!target.IsValid || target.Tile == -1) return false;
 
             Universum.World.ObjectHolder objectHolder = Universum.World.ObjectHolderCache.Get(target.Tile);
             bool dynamicLifeCycle = objectHolder != null && (objectHolder.keepAfterAbandon == false || objectHolder.celestialObject.deathTick != null);