Fix for Quarry (#187)

Co-authored-by: Hazzer <[email protected]>
Aviuz · Jun 14, 2020 · fcaa7bf · fcaa7bf
1 parent fcc4fb6
commit fcaa7bf
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
 	</li>
 	</modDependencies>
 
-	<description>Version 1.1.6
+	<description>Version 1.1.7
 
 This mod force prisoners to work. To enable this feature prisoners must have "Force to work" option checked ("Prisoner" tab). Prison labor needs management that consist:
 - Motivation - prisoners need to be motivated by presence of colonists. Wardens have new job - supervising prisoners. Low motivation can lead to revolts.

diff --git a/Assemblies/PrisonLabor.dll b/Assemblies/PrisonLabor.dll
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 </p>
 <p align="center">
   <a href="https://github.com/Aviuz/PrisonLabor/releases">
-    <img src="https://img.shields.io/badge/version-1.1.6-orange.svg?style=flat" alt="v1.1.6" />
+    <img src="https://img.shields.io/badge/version-1.1.7-orange.svg?style=flat" alt="v1.1.7" />
   </a>
 </p>
 

diff --git a/Source/CompatibilityPatches/Quarry.cs b/Source/CompatibilityPatches/Quarry.cs
@@ -45,7 +45,7 @@ public static Job postfix_Job(Job __result, Pawn pawn, Thing t, bool forced)
         {
             WorkTypeDef workDef = DefDatabase<WorkTypeDef>.GetNamed("QuarryMining");
 
-            if (__result != null && pawn.Faction.IsPlayer && !pawn.IsPrisonerOfColony && PrisonLaborUtility.IsDisabledByLabor(__result.targetA.Cell, pawn, workDef))
+            if (__result != null && !pawn.IsPrisonerOfColony && pawn.Faction != null && pawn.Faction.IsPlayer && PrisonLaborUtility.IsDisabledByLabor(__result.targetA.Cell, pawn, workDef))
             {
                 return null;
             }

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs
@@ -56,6 +56,7 @@ public enum Version
         v1_1_3,
         v1_1_4,
         v1_1_5,
-        v1_1_6
+        v1_1_6,
+        v1_1_7
     }
 }
diff --git a/Source/Core/Meta/VersionUtility.cs b/Source/Core/Meta/VersionUtility.cs
@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v1_1_6;
-        public const string versionString = "1.1.6";
+        public const Version versionNumber = Version.v1_1_7;
+        public const string versionString = "1.1.7";
 
         public static Version VersionOfSaveFile { get; set; }
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,6 @@
 Changelog:
+1.1.7
+- fix for NPR in quarry patches
 1.1.6
 - removed patching for mod SeedsPlease. Potientialy should work with PL without issue. (Not tested)
 - added more checks to NPR exceptions
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ public enum Version @@
             v1_1_3,
             v1_1_4,
             v1_1_5,
-            v1_1_6
+            v1_1_6,
+            v1_1_7
         }
     }