From 51b88cabbcb9d6e9bb4560a99a1e73a1e04c8a7c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 27 May 2018 23:39:08 -0500
Subject: [PATCH] Update upstream CB

---
 Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch | 4 ++--
 work/CraftBukkit                                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch
index ef0b6b18cc..2af7b4654c 100644
--- a/Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From a9bf0ad7d65a13fea2f4340fd6cea3c8c307c393 Mon Sep 17 00:00:00 2001
+From d4c410f78c5e5fd8c0a6760d878843080572f49a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:37 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
@@ -96,5 +96,5 @@ index 00000000..480293e9
 +    }
 +}
 -- 
-2.14.2
+2.17.0
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d0a3620c2d..8cc5a7ecb6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d0a3620c2dc8a22438808f395348c100a183a618
+Subproject commit 8cc5a7ecb6204e23bf883bb9282dd2b70e0f7858