From 7a886eefb9996d5e5287d637da4d8169df900de3 Mon Sep 17 00:00:00 2001 From: MCTBL <30978504+MCTBL@users.noreply.github.com> Date: Wed, 6 May 2026 13:11:27 +0800 Subject: [PATCH] add null check to prevent crashing (#280) --- .../tools/inventory/PatternShaperChestContainer.java | 8 +++++--- .../tools/inventory/PatternShaperContainer.java | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/tools/inventory/PatternShaperChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperChestContainer.java index af03d7f9..f30569a3 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternShaperChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperChestContainer.java @@ -101,12 +101,14 @@ public class PatternShaperChestContainer extends Container { } // special for shift click the output pattern if (slotId == 1) { - this.inventorySlots.get(0).decrStackSize(1); + Slot blankPatternSlot = this.inventorySlots.get(0); + // special for shift click the output pattern + blankPatternSlot.decrStackSize(1); // if there still have blank pattern - if (this.inventorySlots.get(0).getStack().stackSize != 0) { + if (blankPatternSlot.getHasStack() && blankPatternSlot.getStack().stackSize != 0) { ItemStack stackCopy = stack.copy(); stackCopy.stackSize = 1; - this.inventorySlots.get(1).putStack(stackCopy); + this.inventorySlots.get(1).putStack(stack.copy()); } } } else { diff --git a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java index c1d6dacd..88910714 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java @@ -81,10 +81,11 @@ public class PatternShaperContainer extends Container { return null; } if (stack.getItem() instanceof IPattern && slotId == 1) { + Slot blankPatternSlot = this.inventorySlots.get(0); // special for shift click the output pattern - this.inventorySlots.get(0).decrStackSize(1); + blankPatternSlot.decrStackSize(1); // if there still have blank pattern - if (this.inventorySlots.get(0).getStack().stackSize != 0) { + if (blankPatternSlot.getHasStack() && blankPatternSlot.getStack().stackSize != 0) { ItemStack stackCopy = stack.copy(); stackCopy.stackSize = 1; this.inventorySlots.get(1).putStack(stack.copy());