diff --git a/About/About.xml b/About/About.xml index 12735016..dadbf9c4 100644 --- a/About/About.xml +++ b/About/About.xml @@ -19,7 +19,7 @@ - Version 1.1.6 + 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 index 911b21f4..f31cbae2 100644 Binary files a/Assemblies/PrisonLabor.dll and b/Assemblies/PrisonLabor.dll differ diff --git a/README.md b/README.md index c18191f8..13e25878 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- v1.1.6 + v1.1.7

diff --git a/Source/CompatibilityPatches/Quarry.cs b/Source/CompatibilityPatches/Quarry.cs index 4fc17f60..22ed973f 100644 --- 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.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 index fa4264c4..fe0b5f88 100644 --- 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 index 30171a97..5097725c 100644 --- 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 index a47d05fa..8b03a2d3 100644 --- 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