From 1f60c7a520ced2f44d4967c2c41e4f03e7d8bb10 Mon Sep 17 00:00:00 2001
From: Noah van der Aa <ndvdaa@gmail.com>
Date: Thu, 27 Jan 2022 15:35:36 +0100
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#7411)

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:
af88996a SPIGOT-6890: Add repair cost amount in AnvilInventory
bc7bd363 PR-716: Fix scheduler javadocs (previously, the <b> tag broke the rendering)
6db1ab70 Improve item cooldown JavaDocs

CraftBukkit Changes:
13670b44 SPIGOT-6890: Add repair cost amount in AnvilInventory
0d109e86 PR-999: Prevent non-item cooldowns
---
 work/Bukkit      | 2 +-
 work/CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/Bukkit b/work/Bukkit
index 2af60c8067..af88996a3d 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 2af60c806780969df782dec9263094ed3ecab39b
+Subproject commit af88996a3dd1cc3a5c0149f9c0d26c0135cea4a6
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 30b4043e2a..13670b4426 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 30b4043e2a5385518a72e6ca4b9efa664bad4a55
+Subproject commit 13670b442660ef151389f5c4ae762864bed4f8f4