From 21f2727b327f129d1f73da4aa3069c3fed492bfb Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Tue, 3 Dec 2024 22:22:01 +0100
Subject: [PATCH] fixed requestExistingItem returning an incorrect amount of
 already requested items

closes #229
---
 .../prettypipes/network/PipeNetwork.java      | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java b/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java
index c68035e..652dbf6 100644
--- a/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java
+++ b/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java
@@ -280,28 +280,27 @@ public class PipeNetwork extends SavedData implements GraphListener<BlockPos, Ne
         if (location.getPos().equals(destInventory))
             return stack;
         // make sure we don't pull any locked items
-        var amount = location.getItemAmount(this.level, stack, equalityTypes);
-        if (amount <= 0)
+        var available = location.getItemAmount(this.level, stack, equalityTypes);
+        if (available <= 0)
             return stack;
-        amount -= this.getLockedAmount(location.getPos(), stack, ignoredLock, equalityTypes);
-        if (amount <= 0)
+        available -= this.getLockedAmount(location.getPos(), stack, ignoredLock, equalityTypes);
+        if (available <= 0)
             return stack;
-        // make sure we only extract less than or equal to the requested amount
-        if (stack.getCount() < amount)
-            amount = stack.getCount();
+        var toExtract = Math.min(stack.getCount(), available);
+        var extractedSoFar = 0;
         for (int slot : location.getStackSlots(this.level, stack, equalityTypes)) {
             // try to extract from that location's inventory and send the item
             var handler = location.getItemHandler(this.level);
-            var extracted = handler.extractItem(slot, amount, true);
+            var extracted = handler.extractItem(slot, toExtract - extractedSoFar, true);
             if (this.routeItemToLocation(location.pipePos, location.getPos(), destPipe, destInventory, extracted, speed -> itemSupplier.apply(extracted, speed))) {
                 handler.extractItem(slot, extracted.getCount(), false);
-                amount -= extracted.getCount();
-                if (amount <= 0)
+                extractedSoFar += extracted.getCount();
+                if (extractedSoFar >= toExtract)
                     break;
             }
         }
         // we reduce the amount by what we managed to extract & insert in the for loop, so the amount down here will be what we couldn't
-        return stack.copyWithCount(amount);
+        return stack.copyWithCount(stack.getCount() - extractedSoFar);
     }
 
     public PipeBlockEntity getPipe(BlockPos pos) {