Merge pull request #258 from Sylfare/fix/item_frame_packet_error

Fix: Player kick when removing an item from a item frame
oddlama · Jul 8, 2024 · a535cc8 · a535cc8
2 parents 85c7084 + f31cc1b
commit a535cc8
Showing 1 changed file with 2 additions and 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
@@ -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<net.minecraft.world.item.ItemStack>(x.id(),