From f31cc1bf966412e2b822e71192c3082e72544aae Mon Sep 17 00:00:00 2001 From: Sylfare <12037446+Sylfare@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:03:16 +0200 Subject: [PATCH] fix: Player kick when punching a item frame with an item in it --- .../oddlama/vane/core/enchantments/CustomEnchantmentFixer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vane-core/src/main/java/org/oddlama/vane/core/enchantments/CustomEnchantmentFixer.java b/vane-core/src/main/java/org/oddlama/vane/core/enchantments/CustomEnchantmentFixer.java index f25b8ddc1..186a9026b 100644 --- a/vane-core/src/main/java/org/oddlama/vane/core/enchantments/CustomEnchantmentFixer.java +++ b/vane-core/src/main/java/org/oddlama/vane/core/enchantments/CustomEnchantmentFixer.java @@ -112,7 +112,8 @@ public ContainerAdapter(PacketType type) { public void onPacketSending(PacketEvent event) { if (event.getPacket().getHandle() instanceof ClientboundSetEntityDataPacket edp) { var newlist = edp.packedItems().stream().map(x -> { - if (x.value() instanceof net.minecraft.world.item.ItemStack itemStack) { + if (x.value() instanceof net.minecraft.world.item.ItemStack itemStack && !itemStack.isEmpty()) { + var bukkititem = CustomEnchantmentFixer.removeVaneEnchants(itemStack.asBukkitCopy()); var newitem = Nms.item_handle(bukkititem); return new DataValue(x.id(),