Fix trying to extract empty item resource

Fixes Sinytra/Connector#497
Sinytra · Nov 11, 2023 · 51502a0 · 51502a0
1 parent 142e25a
commit 51502a0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ItemStorageItemHandler.java b/...api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ItemStorageItemHandler.java
@@ -69,11 +69,14 @@ public int getSlots() {
     public @NotNull ItemStack extractItem(int slot, int amount, boolean simulate) {
         try (Transaction transaction = Transaction.openOuter()) {
             ItemVariant resource = slots.get(slot).getResource();
-            int extracted = (int) storage.extract(resource, amount, transaction);
-            if (!simulate) {
-                transaction.commit();
-            }
-            return resource.toStack(extracted);
+			if (!resource.isBlank()) {
+				int extracted = (int) storage.extract(resource, amount, transaction);
+				if (!simulate && extracted > 0) {
+					transaction.commit();
+				}
+				return resource.toStack(extracted);
+			}
+			return ItemStack.EMPTY;
         }
     }