From f5268aef5106e1c69a24012d323b1ada3d53f774 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 28 Feb 2021 19:01:59 -0500
Subject: [PATCH] Fix extractor duplicating items

---
 .../shadowfacts/phycon/component/NetworkStackDispatcher.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
index ae2f329..0e76b57 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
@@ -7,6 +7,7 @@ import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.packet.CapacityPacket
 import net.shadowfacts.phycon.packet.CheckCapacityPacket
 import net.shadowfacts.phycon.packet.ItemStackPacket
+import kotlin.math.min
 
 /**
  * @author shadowfacts
@@ -49,7 +50,9 @@ interface NetworkStackDispatcher<Insertion: NetworkStackDispatcher.PendingInsert
 		while (!remaining.isEmpty && sortedResults.isNotEmpty()) {
 			val (capacity, receivingInterface) = sortedResults.removeFirst()
 			if (capacity <= 0) continue
-			sendPacket(ItemStackPacket(remaining.copy(), ipAddress, receivingInterface.ipAddress))
+			val copy = remaining.copy()
+			copy.count = min(capacity, copy.count)
+			sendPacket(ItemStackPacket(copy, ipAddress, receivingInterface.ipAddress))
 			// todo: the destination should confirm how much was actually inserted, in case of race condition
 			remaining.count -= capacity
 		}