diff --git a/Spigot-Server-Patches/0329-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0329-Add-hand-to-bucket-events.patch
index 3e15d0284b..62e284a460 100644
--- a/Spigot-Server-Patches/0329-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0329-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 2c6d1dfa07de5e7327b1ab86be0795e156d9279c Mon Sep 17 00:00:00 2001
+From c0a59687fae964076d0e6aa85de5e88395269ee2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
@@ -18,7 +18,7 @@ index b2010ffa6..3493c4c44 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 4355ef52c..e720dded0 100644
+index 2c36c3990..b38ee2853 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -37,7 +37,7 @@ public class ItemBucket extends Item {
@@ -64,8 +64,8 @@ index 4355ef52c..e720dded0 100644
 -                    PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, clicked.getX(), clicked.getY(), clicked.getZ(), enumdirection, itemstack);
 +                    PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, clicked.getX(), clicked.getY(), clicked.getZ(), enumdirection, itemstack, enumhand); // Paper - add enumHand
                      if (event.isCancelled()) {
+                         ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          // TODO: inventory not updated
-                         return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 index 140ddae0d..9037a1233 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -105,5 +105,5 @@ index 140ddae0d..9037a1233 100644
          }
  
 -- 
-2.11.0
+2.18.0
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 200b239819..53d3ac0a97 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 200b239819d6d57e4f031bc1e2a41cf4962ea5f1
+Subproject commit 53d3ac0a970b311f51c97a6652bb49d550c3067e