From edfab829710888ddd00aa44f9bdf329480e598a4 Mon Sep 17 00:00:00 2001
From: Automated <noreply+automated@papermc.io>
Date: Fri, 1 Jan 2021 17:17:25 -0500
Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
64c36cce #568: Added get/set ItemStack methods to trident

CraftBukkit Changes:
f1187a24c #778: Added get/set ItemStack methods to trident
---
 work/Bukkit      | 2 +-
 work/CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/Bukkit b/work/Bukkit
index f4a9ed36c2..64c36cce23 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit f4a9ed36c2d9276713078ea0ae92e47e23a2f828
+Subproject commit 64c36cce230d53551d364159757d108118b87dbe
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fa6d549d90..f1187a24c7 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fa6d549d9006e62452fddb36b295f9e95a00efac
+Subproject commit f1187a24c7f6603b8e879872d675897790494702