From caf79d40ae2977fe5a56946a8de9c0b1e3907914 Mon Sep 17 00:00:00 2001 From: VoidLeech Date: Fri, 5 Jul 2024 02:29:33 +0200 Subject: [PATCH] Revert "Preserve getOrCreateStack" This reverts commit a6f5c51d6a3a2c971d6a4f40cfdc3ee4499b63d9. Would duplicate the enchants on the backtank --- .../simibubi/create/content/equipment/armor/BacktankBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java index 59ca29710..aa07e001f 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java @@ -158,7 +158,7 @@ public class BacktankBlock extends HorizontalKineticBlock ItemStack stack = new ItemStack(item); Optional blockEntityOptional = getBlockEntityOptional(blockGetter, pos); - CompoundTag tag = stack.getOrCreateTag().merge(blockEntityOptional.map(BacktankBlockEntity::getFullNbt).orElse(new CompoundTag())); + CompoundTag tag = blockEntityOptional.map(BacktankBlockEntity::getFullNbt).orElse(stack.getOrCreateTag()); int air = blockEntityOptional.map(BacktankBlockEntity::getAirLevel) .orElse(0);