diff --git a/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
index a6b5a323e1..2310c9fa1c 100644
--- a/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 0db6c0e06db178998371bbb76962c9413b67d72f Mon Sep 17 00:00:00 2001
+From b0ce442eecdfb77849cbfa7916cdbbb7410f4704 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e0cd7bd8..801c3fb8 100644
+index e0cd7bd857..801c3fb8e0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -94,7 +94,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index e0cd7bd8..801c3fb8 100644
      protected int k;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 1cecccef..c77d7c16 100644
+index 85d364b8f4..ff6c8e2b55 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -70,7 +70,8 @@ public class ItemBlock extends Item {
@@ -28,11 +28,11 @@ index 1cecccef..c77d7c16 100644
 -        boolean defaultReturn = iblockdata.canPlace(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()) && blockactioncontext.getWorld().a(iblockdata, blockactioncontext.getClickPosition());
 +        final World world = blockactioncontext.getWorld(); // Paper
 +        boolean defaultReturn = iblockdata.canPlace(world, blockactioncontext.getClickPosition()) && world.a(iblockdata, blockactioncontext.getClickPosition()) && world.checkNoVisiblePlayerCollisions(blockactioncontext.getEntity(), iblockdata.getCollisionShape(world, blockactioncontext.getClickPosition())); // Paper - Use our entity search
+         org.bukkit.entity.Player player = (blockactioncontext.getEntity() instanceof EntityPlayer) ? (org.bukkit.entity.Player) blockactioncontext.getEntity().getBukkitEntity() : null;
  
-         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), CraftBlockData.fromData(iblockdata), defaultReturn);
-         blockactioncontext.getWorld().getServer().getPluginManager().callEvent(event);
+         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 1ea8464a..35b08a5f 100644
+index 1ea8464aeb..35b08a5f99 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -24,6 +24,7 @@ public abstract class VoxelShape {
@@ -44,7 +44,7 @@ index 1ea8464a..35b08a5f 100644
          if (this.isEmpty()) {
              throw new UnsupportedOperationException("No bounds for empty shape.");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fa94e41f..ad1011a2 100644
+index fa94e41f0f..ad1011a22a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1595,6 +1595,37 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -86,7 +86,7 @@ index fa94e41f..ad1011a2 100644
          if (voxelshape.isEmpty()) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 630a43bc..da779ecb 100644
+index 630a43bc41..da779ecb3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -889,6 +889,14 @@ public class CraftEventFactory {
@@ -105,5 +105,5 @@ index 630a43bc..da779ecb 100644
          return event;
      }
 -- 
-2.17.1
+2.19.1
 
diff --git a/work/Bukkit b/work/Bukkit
index 7631ed33d4..689f15654d 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 7631ed33d4c4144127be13dc6796b420cea2c636
+Subproject commit 689f15654dbcf994a9482d59066e3847cd6baf95
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b1d149cfd0..1cac9d4fc1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b1d149cfd00b5715474feb304d1bbc8fdffa9bd1
+Subproject commit 1cac9d4fc1263efb19140b808ec8671d3e3bfc5e