v3.1.2 fixes a few cases that 3.1.1 did miss

pardeike · Nov 18, 2020 · 0e863d6 · 0e863d6
1 parent 0abd98d
commit 0e863d6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/1.1/Assemblies/AchtungMod.dll b/1.1/Assemblies/AchtungMod.dll
diff --git a/1.2/Assemblies/AchtungMod.dll b/1.2/Assemblies/AchtungMod.dll
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.achtung</identifier>
-  <version>3.1.1.0</version>
+  <version>3.1.2.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>be673269-db56-463b-8c36-e074881e0d77</ID>
   <ModName>Achtung!</ModName>
-  <Version>3.1.1.0</Version>
+  <Version>3.1.2.0</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>pardeike</Owner>

diff --git a/Source/ForcedFloatMenuOption.cs b/Source/ForcedFloatMenuOption.cs
@@ -163,7 +163,7 @@ public static bool ForceActionSynced(Pawn forcePawn, WorkGiver_Scanner forceWork
 			var workgiverDefs = ForcedWork.GetCombinedDefs(forceWorkgiver);
 			foreach (var workgiverDef in workgiverDefs)
 			{
-				var workgiver = workgiverDef.Worker as WorkGiver_Scanner;
+				var workgiver = workgiverDef.giverClass == null ? null : workgiverDef.Worker as WorkGiver_Scanner;
 				if (workgiver == null) continue;
 
 				var item = ForcedWork.HasJobItem(forcePawn, workgiver, cell);
@@ -194,4 +194,4 @@ public virtual bool ForceAction()
 			return ForceActionSynced(forcePawn, forceWorkgiver, forceCell.x, forceCell.z);
 		}
 	}
-}
+}
diff --git a/Source/ForcedJob.cs b/Source/ForcedJob.cs
@@ -100,7 +100,7 @@ public IEnumerable<IntVec3> AllCells(bool onlyValid = false)
 				return validTargets.Select(target => target.item.Cell);
 		}
 
-		public IEnumerable<WorkGiver_Scanner> WorkGivers => workgiverDefs.Select(wgd => (WorkGiver_Scanner)wgd.Worker);
+		public IEnumerable<WorkGiver_Scanner> WorkGivers => workgiverDefs.Where(wgd => wgd.giverClass != null).Select(wgd => (WorkGiver_Scanner)wgd.Worker);
 
 		public static int MaterialScore(LocalTargetInfo item)
 		{
@@ -476,4 +476,4 @@ public static Job GetCellJob(this IntVec3 cell, Pawn pawn, WorkGiver_Scanner wor
 			return null;
 		}
 	}
-}
+}
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 
 [assembly: Guid("8bd5a28f-96c4-43b4-907f-600aa0162f84")]
 
-[assembly: AssemblyVersion("3.1.1.0")]
-[assembly: AssemblyFileVersion("3.1.1.0")]
+[assembly: AssemblyVersion("3.1.2.0")]
+[assembly: AssemblyFileVersion("3.1.2.0")]