prevent self-hauling for mechs with hauling module, causing crash

rheirman · Apr 24, 2019 · 2d1a4da · 2d1a4da
1 parent 961bf8b
commit 2d1a4da
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/Assemblies/WhatTheHack.dll b/Assemblies/WhatTheHack.dll
diff --git a/Source/WhatTheHack/Buildings/Building_RogueAI.cs b/Source/WhatTheHack/Buildings/Building_RogueAI.cs
@@ -59,7 +59,6 @@ public class Building_RogueAI : Building
 
         private bool warnedPlayerAboutMood = false;
 
-
         public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
             base.SpawnSetup(map, respawningAfterLoad);

diff --git a/Source/WhatTheHack/Jobs/WorkGiver_HaulMechanoid.cs b/Source/WhatTheHack/Jobs/WorkGiver_HaulMechanoid.cs
@@ -30,6 +30,10 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
         {
             Job result = null;
             Pawn mech = t as Pawn;
+            if (pawn == mech)
+            {
+                return null;
+            }
             if(mech != null && HaulAIUtility.PawnCanAutomaticallyHaulFast(pawn, t, forced))
             {
                 Building_HackingTable closestAvailableTable = Utilities.GetAvailableHackingTable(pawn, mech);
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,6 @@ public class Building_RogueAI : Building @@
             private bool warnedPlayerAboutMood = false;
             public override void SpawnSetup(Map map, bool respawningAfterLoad)
             {
                 base.SpawnSetup(map, respawningAfterLoad);
@@ Expand Down @@