From 3d01311604cd62b253f303d07890b7d104f4228d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Nov 2017 12:22:26 -0600 Subject: [PATCH] Fix incorrect corporea result message. Closes #2424 --- .../common/integration/corporea/WrappedIInventory.java | 4 ++-- .../common/integration/corporea/WrappedInventoryBase.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 3c728a1a1..5716b7151 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -23,8 +23,8 @@ public class WrappedIInventory extends WrappedInventoryBase{ private final InvWithLocation inv; private WrappedIInventory(InvWithLocation inv, ICorporeaSpark spark) { + super(spark); this.inv = inv; - this.spark = spark; } @Override @@ -51,6 +51,7 @@ public class WrappedIInventory extends WrappedInventoryBase{ // IWrappedInventory - keep it synch if(isMatchingItemStack(request.matcher, request.checkNBT, stackAt)) { int rem = Math.min(stackAt.getCount(), request.count == -1 ? stackAt.getCount() : request.count); + request.foundItems += stackAt.getCount(); if(rem > 0) { stacks.add(inv.handler.extractItem(i, rem, !doit)); @@ -58,7 +59,6 @@ public class WrappedIInventory extends WrappedInventoryBase{ spark.onItemExtracted(stackAt); } - request.foundItems += stackAt.getCount(); request.extractedItems += rem; if(request.count != -1) diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java index 8dfbed9cf..7efe639a7 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java @@ -20,7 +20,11 @@ import java.util.List; public abstract class WrappedInventoryBase implements IWrappedInventory { - protected ICorporeaSpark spark; + protected final ICorporeaSpark spark; + + public WrappedInventoryBase(ICorporeaSpark spark) { + this.spark = spark; + } @Override public ICorporeaSpark getSpark() {