From 88f3c8992518a08068c079ff62754f8be69cdb3f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 17 Dec 2019 04:08:50 +0000
Subject: [PATCH] Updated Upstream (CraftBukkit/Spigot)

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:
e631456c SPIGOT-5458: Riptide tridents don't lose durability

Spigot Changes:
3b314f59 SPIGOT-5459: Add minecraft.debugstick.always permission to allow use in survival etc
---
 work/CraftBukkit | 2 +-
 work/Spigot      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/CraftBukkit b/work/CraftBukkit
index e43416a342..e631456c7d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit e43416a342cbb52a9b524e504c4bb7edfe317db0
+Subproject commit e631456c7deac6ce4fae656405723faa8571d736
diff --git a/work/Spigot b/work/Spigot
index 047b6f86bc..3b314f5953 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 047b6f86bc7927f729039fb212aae9ca676da019
+Subproject commit 3b314f5953d6b5f4e0a0bd0345495c30c4c48aa8