From e05ef861c0e4a9d8206f5363f0c760e3181b47a1 Mon Sep 17 00:00:00 2001
From: notfood <notfood@users.noreply.github.com>
Date: Tue, 27 Nov 2018 21:25:28 -0500
Subject: [PATCH] Handle recycle output better

---
 Assemblies/MendAndRecycle.dll | Bin 24576 -> 24576 bytes
 Source/JobDriver_Recycle.cs   |  14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Assemblies/MendAndRecycle.dll b/Assemblies/MendAndRecycle.dll
index f5c7bc6a3d75feccd7656f9b875b61c12475513a..f14ecac9acb6d574257166f3e6c4736d719df4b8 100644
GIT binary patch
delta 605
zcmZoTz}RqraY6_4v!8z_cFQvEo47KZFQ=S=!Jh#L8W<RsFi%tz=2^hNzysu)lrb>K
zOjcylnH<Te&Uj>UBamD&c_m}G-~yl)5bywECI(i9fX#wT%_59*CQlXH!1!*nn|K!^
zqwnO460;dsP0p2E%O%K>e}jR6OWc0LWKAhw0SQ44vHY7r0gbyrB7gbhRw+waiTo6h
z5>XNH{QE$L8dJ3#0|Sf310Y-5Yw~$1OTKELd$_8n00{~4{MDPeq+R&xEi6IqXl4**
zn$01`5DDcKGf6XuF|>nuZ4xblj6mKpFz+E_FgqKAIKv7kFI`L;$aA#;nevdcM%0Bv
zoWU2uW85MFQVEmWC#nPFg+S$m1s4KU&e4K$!v&pyl1sq6i41$0jG4t5c0hO%D+Dz-
zBpCEIf7hJO!SYkeYwG4nMt(8^bGglm{H>?CZf$Wq!1d;V<K_>3E}X0ZKtBd-wv3Qx
z6q*7JWRTO=f!GQY6~!1AOm2*<oXi(x$Lq!nl7RrX$&pdU++I_EN-;1nG63nx)1wj@
zmrec|rOengSvGn;vmFEf<o(gw{H6?g48{x=3`PuwK$2ne*Jx=*W+$MeaIC&4nk3L{
gH=s;#tT8W&%;b#`X`BU+L~_7<vtZnN#)$^(0Qt3wOaK4?

delta 573
zcmZoTz}RqraY6_4)_K1tcFQuZnz%BYFQS}*!Jh#L8W<R6Fi&ob6yauI-~sX#$`}}A
zCMz=OOpat!XWTHk5lGIMypl0oum`9G1U!J4iGh{DX0squvj}6y<f&pC7;kNM6YpYV
zw48iVVm9OY$+?ni`7Is;6$*0X-(X<i5_ecUSw+g1UywsA|0a;HaTiF`UY*=1WjT4K
zC_l5dvDD->l5&&3Nl7tjJlHHJ?ZQ{DVhOUXnL(IoHisC4E0kBvB+VekPz>g^Nwf$u
z0(q0byoZdz>}(9;3{#-IbTMfl&(H>B%0tc?Q5Ozz21^K!af=8@B}{Igs1A_l0F@IK
zTnJRzp#|lJ3pxQMCxCeq8TK+6GmA4Uf$$_&2x@RhFi36Y)|$@2@<XafVDmB~KN*3E
zwJLm1Qe>Pro?txEXvuY9GmF0qC#wxGWNkM4M#wV?H9&(B<g{5Jw!%b3F~*+BQzI)U
zJ1~k&=8Ll9wP6OyLV(TW$S7m(B7q-L3=E76Kzj1@s6@s&lYd4jGgeHNjh@eJ!@xIr
zf3!BY34<Pk34;-XA%nr@pV88c%nm>a@mPI9BnhCIE<n-fSYu@6lP^XTa27xk!5Z_;
Mf^qK|CmOH=0C-k`*#H0l

diff --git a/Source/JobDriver_Recycle.cs b/Source/JobDriver_Recycle.cs
index ff8096f..9e78ae4 100644
--- a/Source/JobDriver_Recycle.cs
+++ b/Source/JobDriver_Recycle.cs
@@ -91,18 +91,22 @@ protected override Toil DoBill ()
                                     Log.Error ("MendAndRecycle :: " + pawn + " could not drop recipe product " + list [j] + " near " + pawn.Position);
                                 }
                             }
-                        } else if (list.Count == 1) {
+                        }
+
+                        if (list.Count >= 1) {
                             list [0].SetPositionDirect (pawn.Position);
 
                             job.bill.Notify_IterationCompleted (pawn, list);
-                            job.targetB = list [0];
+                            job.SetTarget(IngredientInd, list[0]);
+
+                            pawn.Map.reservationManager.Reserve (pawn, job, job.GetTarget(IngredientInd), 1);
 
-                            pawn.Map.reservationManager.Reserve (pawn, job, job.targetB, 1);
+                            ReadyForNextToil();
                         } else {
                             Log.Message ("MendAndRecycle :: " + pawn + " could not reclaim anything from " + objectThing);
-                        }
 
-                        ReadyForNextToil ();
+                            pawn.jobs.EndCurrentJob(JobCondition.Succeeded);
+                        }
                     }
 
                     workCycleProgress = workCycle;