Tracker fixes (#193)

* Fix for latest optimalization * version up * Fixes... Co-authored-by: Hazzer <[email protected]>
Aviuz · Jun 21, 2020 · 7fde629 · 7fde629
1 parent c6c57c0
commit 7fde629
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
 	</li>
 	</modDependencies>
 
-	<description>Version 1.1.8
+	<description>Version 1.1.9
 
 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.8-orange.svg?style=flat" alt="v1.1.8" />
+    <img src="https://img.shields.io/badge/version-1.1.9-orange.svg?style=flat" alt="v1.1.9" />
   </a>
 </p>
 

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs
@@ -58,6 +58,7 @@ public enum Version
         v1_1_5,
         v1_1_6,
         v1_1_7,
-        v1_1_8
+        v1_1_8,
+        v1_1_9
     }
 }
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_8;
-        public const string versionString = "1.1.8";
+        public const Version versionNumber = Version.v1_1_9;
+        public const string versionString = "1.1.9";
 
         public static Version VersionOfSaveFile { get; set; }
 

diff --git a/Source/Core/Trackers/InspirationTracker.cs b/Source/Core/Trackers/InspirationTracker.cs
@@ -94,6 +94,11 @@ public static void Calculate(Map map)
 
                     foreach (var warden in wardens)
                     {
+                        if(warden.GetRoom() == null)
+                        {
+                            continue;
+                        }
+
                         var roomId = warden.GetRoom().ID;
 
                         if (!roomsIdtoWardens.ContainsKey(roomId))
@@ -106,11 +111,11 @@ public static void Calculate(Map map)
 
                     foreach (var prisoner in prisoners)
                     {
-                        var roomId = prisoner.GetRoom().ID;
-                        if (!roomsIdtoWardens.ContainsKey(roomId))
+                        if (prisoner.GetRoom() == null || !roomsIdtoWardens.ContainsKey(prisoner.GetRoom().ID))
                         {
                             continue;
                         }
+                        var roomId = prisoner.GetRoom().ID;
 
                         foreach (var warden in roomsIdtoWardens[roomId])
                         {

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,6 @@
 Changelog:
+1.1.9
+- NPR fix for previus optimization
 1.1.8
 - Turn on/off prisoner suicide should work now
 - Performance optimization (https://github.com/kbatbouta)
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ public enum Version @@
             v1_1_5,
             v1_1_6,
             v1_1_7,
-            v1_1_8
+            v1_1_8,
+            v1_1_9
         }
     }