From cb95469f997b6bf6be0e49b9c9abe22c101f7171 Mon Sep 17 00:00:00 2001
From: MiniDigger | Martin <admin@minidigger.dev>
Date: Tue, 23 Nov 2021 06:49:33 +0100
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
64c8bd39 #679: Add getHideOnlinePlayers
b991b6c7 #677: Add "Allow Server Listings" API
4e9f199a SPIGOT-6801: Wrong BlockData classes in Material enum for SOUL_FIRE and SOUL_TORCH

CraftBukkit Changes:
37e63e63 Fix loading / creating secondary worlds (nether/end)
4bf7f33c #956: Add getHideOnlinePlayers
d181e1ed Fix serializing unhandled NBT + add unit test with unhandled NBT
aebb79e3 #954: Add "Allow Server Listings" API
7c4707e4 #955: Add test for BlockData class of Material

Spigot Changes:
16c0cb41 Rebuild patches
---
 patches/api/Adventure.patch | 2 +-
 work/Bukkit                 | 2 +-
 work/CraftBukkit            | 2 +-
 work/Spigot                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index 57c3763aa4..58eeaae113 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -1890,7 +1890,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
-     public void openBook(@NotNull ItemStack book);
+     public boolean isAllowingServerListings();
  
 +    // Paper start
 +    @NotNull
diff --git a/work/Bukkit b/work/Bukkit
index 0a35cb18fc..64c8bd39e0 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0a35cb18fc92be8858f7abc3a23ed19fb4dfa326
+Subproject commit 64c8bd39e019135647e27f919b19ea03de2e6d92
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f38217938a..37e63e63e8 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f38217938a61af5f84d0df76f71a339bd1dc1280
+Subproject commit 37e63e63e89052671198b6cdb775d5250a5d18e1
diff --git a/work/Spigot b/work/Spigot
index 6234669574..16c0cb4167 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 6234669574cf0c5fb951f504399f4b171d1a09a7
+Subproject commit 16c0cb416707182fd13db47ff090ea48bd54e494