v1.0.1

Fixed the NullReferenceException when attempting to bond with an animal before any rules have been set
Jaxe-Dev · Aug 21, 2018 · 1575cea · 1575cea
1 parent ebe8f7f
commit 1575cea
Show file tree

Hide file tree

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

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Pawn Rules
-#### Version 1.0
+![](https://img.shields.io/badge/Version-1.0.1-brightgreen.svg)
+
 Built for **RimWorld 1.0.x / 0.19.x**\
+Powered by **Harmony**\
 Supports **ModSync RW**
 
 [Link to Ludeon Forum Post](https://ludeon.com/forums/index.php?topic=43086.0)

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";
+        public const string Version = "1.0.1";
 
         public static ModContentPack ContentPack { get; private set; }
 

diff --git a/Source/Patch/RimWorld_RelationsUtility_TryDevelopBondRelation.cs b/Source/Patch/RimWorld_RelationsUtility_TryDevelopBondRelation.cs
@@ -10,11 +10,12 @@ internal static class RimWorld_RelationsUtility_TryDevelopBondRelation
     {
         private static bool Prefix(Pawn humanlike, Pawn animal)
         {
-            if (!Registry.IsActive || !humanlike.CanHaveRules()) { return true; }
+            if (!Registry.IsActive || (humanlike == null) || (animal == null) || !humanlike.CanHaveRules()) { return true; }
 
             var rules = Registry.GetRules(humanlike);
+            if (rules == null) { return true; }
             var restrictions = rules.GetRestriction(RestrictionType.Bonding);
-            return (rules == null) || (restrictions.IsVoid) || restrictions.Allows(animal.def);
+            return (restrictions == null) || restrictions.IsVoid || restrictions.Allows(animal.def);
         }
     }
 }