diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-03-28 23:20:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 17:20:14 +0200 |
| commit | bce9f88a14d1017c50ad4f717b4094a851e4a2a5 (patch) | |
| tree | 3417ada254b27f4257f4eb53c98ca168682c9455 /src/main/java/gregtech | |
| parent | 604f27d847ce408126427bd2e742ebe94c24bc13 (diff) | |
| download | GT5-Unofficial-bce9f88a14d1017c50ad4f717b4094a851e4a2a5.tar.gz GT5-Unofficial-bce9f88a14d1017c50ad4f717b4094a851e4a2a5.tar.bz2 GT5-Unofficial-bce9f88a14d1017c50ad4f717b4094a851e4a2a5.zip | |
Check if given slot accepts given input instead of ignoring outright (#993)
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_Container.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java index e00759bf24..a3085b21ba 100644 --- a/src/main/java/gregtech/api/gui/GT_Container.java +++ b/src/main/java/gregtech/api/gui/GT_Container.java @@ -314,7 +314,7 @@ public class GT_Container extends Container { while (aStack.stackSize > 0 && (!par4 && var6 < aSlotCount || par4 && var6 >= aStartIndex)) { var7 = (Slot) this.inventorySlots.get(var6); var8 = var7.getStack(); - if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) { + if (!(var7 instanceof GT_Slot_Holo) && !(var7 instanceof GT_Slot_Output) && var7.isItemValid(aStack) && var8 != null && var8.getItem() == aStack.getItem() && (!aStack.getHasSubtypes() || aStack.getItemDamage() == var8.getItemDamage()) && ItemStack.areItemStackTagsEqual(aStack, var8)) { int var9 = var8.stackSize + aStack.stackSize; if (var8.stackSize < mTileEntity.getInventoryStackLimit()) { if (var9 <= aStack.getMaxStackSize()) { @@ -349,7 +349,7 @@ public class GT_Container extends Container { var7 = (Slot) this.inventorySlots.get(var6); var8 = var7.getStack(); - if (var8 == null) { + if (var7.isItemValid(aStack) && var8 == null) { int var10 = Math.min(aStack.stackSize, mTileEntity.getInventoryStackLimit()); var7.putStack(GT_Utility.copyAmount(var10, aStack)); var7.onSlotChanged(); |