From a4892aee06f35a2c93cfa077e100268d2ba5a532 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Fri, 13 Oct 2023 02:16:18 +0200 Subject: [PATCH] fix NPE in FluidPatternDetails (#163) --- .../client/gui/container/base/FCContainerEncodeTerminal.java | 3 +++ .../java/com/glodblock/github/util/FluidPatternDetails.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index f4a29123..e081d967 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -258,6 +258,9 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor } protected ItemStack stampAuthor(ItemStack patternStack) { + if (patternStack.stackTagCompound == null) { + patternStack.stackTagCompound = new NBTTagCompound(); + } patternStack.stackTagCompound.setString("author", getPlayerInv().player.getCommandSenderName()); return patternStack; } diff --git a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java index e3be4f7e..cc773374 100644 --- a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java +++ b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java @@ -28,7 +28,7 @@ public class FluidPatternDetails implements ICraftingPatternDetails, Comparable< public FluidPatternDetails(ItemStack stack) { this.patternStack = stack; - if (stack.stackTagCompound.hasKey("author")) { + if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("author")) { final ItemStack forComparison = this.patternStack.copy(); forComparison.stackTagCompound.removeTag("author"); this.patternStackAe = Objects.requireNonNull(AEItemStack.create(forComparison)); // s2g