use new1 .0 reservation # calculation

alextd · Jun 19, 2018 · 5dd5bab · 5dd5bab
1 parent 530d221
commit 5dd5bab
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Source/Utilities/ReservationUtility.cs b/Source/Utilities/ReservationUtility.cs
@@ -15,16 +15,15 @@ public static int ReserveAsMuchAsPossible(this Pawn p, LocalTargetInfo target, J
 
 			if (!target.HasThing) return p.Reserve(target, job, maxPawns, stackCount, layer) ? 1 : 0;
 
+			int canDo = p.Map.reservationManager.CanReserveStack(p, target.Thing, maxPawns, layer);
+
 			Thing thing = target.Thing;
 			int desired = stackCount == ReservationManager.StackCount_All ? thing.stackCount : stackCount;
-			for (int tryCount = desired; tryCount > 0; tryCount --)
-			{
-				if (p.CanReserve(target, maxPawns, tryCount, layer) 
-					&& p.Reserve(target, job, maxPawns, tryCount, layer))
-					return tryCount;
-			}
+			canDo = Math.Min(canDo, desired);
+
+			p.Reserve(target, job, maxPawns, stackCount, layer);
 
-			return 0;
+			return canDo;
 		}
 	}
 }