From 6e7dc3f81dc14b603486787443354d4633b32ddb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 28 Jul 2020 04:36:52 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit)

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:
52fd29c0d SPIGOT-6033: Bukkit.getUnsafe().getMaterial() won't match renamed block materials
---
 Spigot-Server-Patches/0009-Timings-v2.patch               | 8 ++++----
 .../0018-Implement-Paper-VersionChecker.patch             | 4 ++--
 ...0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch | 4 ++--
 .../0443-Add-Raw-Byte-ItemStack-Serialization.patch       | 4 ++--
 work/CraftBukkit                                          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index c91365771e..92c4a40e7a 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1407,7 +1407,7 @@ index 3e2e355177e32856dac07dc8b98658ad1b717045..7c5eaff23ef6bf3cdf2575330ea6341d
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b8d3c4d35cee2ba4678f6d22b8ea956d598d9d9b..88fa8d63c5bb2c76ba09db6bb002f6d6b6a42afc 100644
+index d729a6a231f0b48b5b9ddabdf26febb66c0166d9..0222e4d3e0555f043c7466f9daac28a24e2060e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -2147,10 +2147,10 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index de168983ea04519c4951216621b3493245bd8383..b3b2ad576137d0383f43ec444f2353ecad3743d9 100644
+index 1358c99c9f065dd19f7b71b543fc470abcad9611..e0fc695465b3dbbbc1c183cc89760a73b061eb63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -137,6 +137,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -138,6 +138,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return CraftNamespacedKey.toMinecraft(mat.getKey());
      }
      // ========================================================================
@@ -2163,7 +2163,7 @@ index de168983ea04519c4951216621b3493245bd8383..b3b2ad576137d0383f43ec444f2353ec
  
      public static byte toLegacyData(IBlockData data) {
          return CraftLegacy.toLegacyData(data);
-@@ -309,6 +315,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -312,6 +318,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return clazz;
      }
  
diff --git a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
index 638e6c790e..b4efa964cb 100644
--- a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
+++ b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
@@ -126,10 +126,10 @@ index 0000000000000000000000000000000000000000..5deed3e25ff41ab0a4015a5fd0c1e952
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b3b2ad576137d0383f43ec444f2353ecad3743d9..b87b2eacc9a89c79d18c4c2168aca9f5ca953c81 100644
+index e0fc695465b3dbbbc1c183cc89760a73b061eb63..8b45f510bf24bb1f9503cb4dcef0e21b3634400c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -320,6 +320,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -323,6 +323,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public String getTimingsServerName() {
          return com.destroystokyo.paper.PaperConfig.timingsServerName;
      }
diff --git a/Spigot-Server-Patches/0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index ab71bf1a62..89e7e9fe82 100644
--- a/Spigot-Server-Patches/0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b87b2eacc9a89c79d18c4c2168aca9f5ca953c81..ac9105c23cbe36dfbebfff63e074065b8f472c0e 100644
+index 8b45f510bf24bb1f9503cb4dcef0e21b3634400c..d288d5fadbdb7cd4e5a42f94cdba6f825b2ed877 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -325,6 +325,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -328,6 +328,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
          return new com.destroystokyo.paper.PaperVersionFetcher();
      }
diff --git a/Spigot-Server-Patches/0443-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0443-Add-Raw-Byte-ItemStack-Serialization.patch
index 4919aa4c85..e51ef893d3 100644
--- a/Spigot-Server-Patches/0443-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/Spigot-Server-Patches/0443-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -50,10 +50,10 @@ index f48b62af436de47484eb1cf496e97a29168586b0..c948e590eeff0aea53573532f8c507d6
          DataOutputStream dataoutputstream = new DataOutputStream(new BufferedOutputStream(new GZIPOutputStream(outputstream)));
          Throwable throwable = null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ac9105c23cbe36dfbebfff63e074065b8f472c0e..f1e60981abc46807f8004f0ac49127a2bb83fc42 100644
+index d288d5fadbdb7cd4e5a42f94cdba6f825b2ed877..90c1067ca23e566a96d71e06c273d44397928b64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -330,6 +330,46 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -333,6 +333,46 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public boolean isSupportedApiVersion(String apiVersion) {
          return apiVersion != null && SUPPORTED_API.contains(apiVersion);
      }
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 29cce6714a..52fd29c0dc 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 29cce6714a3ee62749fa25c3a7859483075b6f17
+Subproject commit 52fd29c0dca28c0e7d75fc462bd5b6f59a42a85f