v 0.8.4

- fixed null reference exception at loading game
Aviuz · Sep 30, 2017 · e64c3fc · e64c3fc
1 parent 526d400
commit e64c3fc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -3,7 +3,7 @@
 	<name>Prison Labor</name>
 	<author>Avius</author>
 	<targetVersion>0.17.0</targetVersion>
-	<description>Version 0.8.3
+	<description>Version 0.8.4
 
 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-0.8.3-orange.svg?style=flat" alt="v0.7" />
+    <img src="https://img.shields.io/badge/version-0.8.4-orange.svg?style=flat" alt="v0.7" />
   </a>
 </p>
 

diff --git a/Source/Behaviour_MotivationIcon.cs b/Source/Behaviour_MotivationIcon.cs
@@ -35,7 +35,7 @@ public virtual void OnGUI()
         {
             //TODO add icons enabled
             var iconsEnabled = true;
-            var inGame = Find.GameInfo != null && !WorldRendererUtility.WorldRenderedNow;
+            var inGame = Find.GameInfo != null && Find.World != null && Find.World.renderer != null && !WorldRendererUtility.WorldRenderedNow;
 
             if (iconsEnabled && inGame)
                 foreach (var pawn in Find.VisibleMap.mapPawns.AllPawns)

diff --git a/Source/PrefsData.cs b/Source/PrefsData.cs
@@ -41,7 +41,8 @@ public enum Version
         v0_8_0,
         v0_8_1,
         v0_8_2,
-        v0_8_3
+        v0_8_3,
+        v0_8_4
     }
 
     [Flags]

diff --git a/Source/PrisonLabor.csproj b/Source/PrisonLabor.csproj
@@ -126,6 +126,9 @@
     <Compile Include="Tweaks\WorkGiver_Warden_DeliverFood_Tweak.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\About\About.xml">
+      <Link>Organizer\About.xml</Link>
+    </Content>
     <Content Include="..\changelog.txt">
       <Link>Organizer\changelog.txt</Link>
     </Content>
@@ -136,6 +139,11 @@
       <Link>Organizer\TaskList.txt</Link>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\README.md">
+      <Link>Organizer\README.md</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Source/VersionUtility.cs b/Source/VersionUtility.cs
@@ -8,8 +8,8 @@ namespace PrisonLabor
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v0_8_3;
-        public const string versionString = "0.8.3";
+        public const Version versionNumber = Version.v0_8_4;
+        public const string versionString = "0.8.4";
 
         public static void CheckVersion()
         {

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,6 @@
 Changelog:
+0.8.4
+- fixed null reference exception at loading game
 0.8.3
 - fixed bugs with disabling mod (now you can safely disable mod again)
 - fixed bug with prioritizing work
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,8 @@ public enum Version @@
             v0_8_0,
             v0_8_1,
             v0_8_2,
-            v0_8_3
+            v0_8_3,
+            v0_8_4
         }
         [Flags]
@@ Expand Down @@