From c341d207f84b2cdc415f5c577b51472f96f38095 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 15 May 2023 17:19:10 +0300 Subject: [PATCH] Do not call ArmourRemoveHandler on NBT change. Closes #3117 --- RebornCore/src/main/java/reborncore/RebornCore.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index 045b01003..ac8e0c527 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/RebornCore/src/main/java/reborncore/RebornCore.java @@ -33,6 +33,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -116,7 +117,8 @@ public class RebornCore implements ModInitializer { ServerEntityEvents.EQUIPMENT_CHANGE.register((livingEntity, equipmentSlot, previousStack, currentStack) -> { if (livingEntity instanceof PlayerEntity playerEntity - && previousStack.getItem() instanceof ArmorRemoveHandler armorRemoveHandler) { + && previousStack.getItem() instanceof ArmorRemoveHandler armorRemoveHandler + && !ItemStack.areItemsEqual(previousStack, currentStack)) { armorRemoveHandler.onRemoved(playerEntity); } });