v1.0.7

- Fixed possible null reference with non-vanilla pawn types - Fixed erroneous "not allowed artisan builds" tooltip
Jaxe-Dev · Sep 4, 2018 · eb869e4 · eb869e4
1 parent 2e6a31b
commit eb869e4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -3,7 +3,7 @@
 <ModSyncNinjaData>
   <ID>59f538ed-f86d-4506-a4a5-7e9faaa37508</ID>
   <ModName>Pawn Rules</ModName>
-  <Version>v1.0.6</Version>
+  <Version>v1.0.7</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>Jaxe-Dev</Owner>

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Pawn Rules
-![](https://img.shields.io/badge/Version-1.0.6-brightgreen.svg)
+![](https://img.shields.io/badge/Version-1.0.7-brightgreen.svg)
 
 Built for **RimWorld B19**\
 Powered by **Harmony**\

diff --git a/Source/Data/RestrictionTemplate.cs b/Source/Data/RestrictionTemplate.cs
@@ -56,10 +56,10 @@ private static RestrictionTemplate GetAnimalsCategorized(Restriction restriction
                 string category;
 
                 if (animal.RaceProps.petness > 0.5f) { category = categories[0]; }
-                else if (animal.race.tradeTags.Contains("AnimalFarm")) { category = categories[1]; }
+                else if (animal.race.tradeTags?.Contains("AnimalFarm") ?? false) { category = categories[1]; }
                 else if (animal.RaceProps.herdAnimal) { category = categories[2]; }
                 else if (animal.RaceProps.predator) { category = categories[3]; }
-                else if (animal.race.tradeTags.Contains("AnimalInsect")) { category = categories[4]; }
+                else if (animal.race.tradeTags?.Contains("AnimalInsect") ?? false) { category = categories[4]; }
                 else { category = categories[5]; }
 
                 if (!list.ContainsKey(category)) { list[category] = new Category(category); }

diff --git a/Source/Mod.cs b/Source/Mod.cs
@@ -7,7 +7,7 @@ internal class Mod : Verse.Mod
         public const string Id = "PawnRules";
         public const string Name = "Pawn Rules";
         public const string Author = "Jaxe";
-        public const string Version = "1.0.6";
+        public const string Version = "1.0.7";
 
         public static ModContentPack ContentPack { get; private set; }
 

diff --git a/Source/Patch/RimWorld_GenConstruct_CanConstruct.cs b/Source/Patch/RimWorld_GenConstruct_CanConstruct.cs
@@ -13,6 +13,8 @@ private static void Postfix(ref bool __result, Thing t, Pawn p, bool checkConstr
         {
             if (!Registry.IsActive) { return; }
 
+            if (__result == false) { return; }
+
             var rules = Registry.GetRules(p);
             if (!checkConstructionSkill || (rules == null) || rules.AllowArtisan || !((ThingDef) t.def.entityDefToBuild).HasComp(typeof(CompQuality)))
             {