From b25236f0b7f3164d3528089bb79496d5c845f962 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 3 Jul 2020 19:12:08 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
b6a876bc3 SPIGOT-5936: BlockPlaceEvent does not fire for lily_pad
---
 .../0252-Vanished-players-don-t-have-rights.patch             | 4 ++--
 work/CraftBukkit                                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
index f6c122f54..adb94d4d0 100644
--- a/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
@@ -62,10 +62,10 @@ index cdf80e50de0840002f62f4c1df4fbcc4e13675d7..ea5f5845a8d202e62da3ae1bfb1e4dbd
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 6c7f677f68d89d7e08c07a0f24268c5a638b4076..33d38a9a8a55c7a26d9a584e8058f42556b6ed59 100644
+index d83bd0169bb4b8c25f44ae3582e58b8fea97ecbd..63d2294da4f0da628e62b782b71e34cb3eb959b5 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
-@@ -139,7 +139,8 @@ public class ItemBlock extends Item {
+@@ -154,7 +154,8 @@ public class ItemBlock extends Item {
          EntityHuman entityhuman = blockactioncontext.getEntity();
          VoxelShapeCollision voxelshapecollision = entityhuman == null ? VoxelShapeCollision.a() : VoxelShapeCollision.a((Entity) entityhuman);
          // CraftBukkit start - store default return
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 145921e2a..b6a876bc3 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 145921e2a6ca99081f6019321b63e80756f9cac9
+Subproject commit b6a876bc34a0cccbfccb890029a44a61b9853285