SPIGOT-5504: cancelling InventoryMoveItemEvent on composter doesn't properly cancel

2024-11-13 06:07:40 +01:00 · 2020-01-10 09:50:39 +11:00 · 2020-01-10 09:50:39 +11:00 · 99cf10e4c7
commit 99cf10e4c7
parent 108b44ca20
1 changed files with 17 additions and 1 deletions
--- a/nms-patches/BlockComposter.patch
+++ b/nms-patches/BlockComposter.patch
@ -42,7 +42,23 @@
         }
 
         @Override
-@@ -313,8 +317,9 @@
+@@ -306,15 +310,23 @@
+ 
+         @Override
+         public void update() {
+-            BlockComposter.d(this.a, this.b, this.c);
+-            this.d = true;
+            // CraftBukkit start - allow putting items back (eg cancelled InventoryMoveItemEvent)
+            if (this.isNotEmpty()) {
+                BlockComposter.d(this.a, this.b, this.c);
+                this.d = true;
+            } else {
+                this.b.setTypeAndData(this.c, this.a, 3);
+                this.d = false;
+            }
+            // CraftBukkit end
+         }
+     }
 
     static class ContainerEmpty extends InventorySubcontainer implements IWorldInventory {