Merge remote-tracking branch 'gtnh/master' into feature/level-maintainer-terminal

# Conflicts:
#	dependencies.gradle
This commit is contained in:
Andrei Laiff committed 2023-10-13 15:48:23 +03:00
commit f7fb0cf0ba
4 files changed
+8 -5

No files matched your search

@@ -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;
}
@@ -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