From bcab622e55726aba4bd5ca3e38dc67789b3edeab Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 30 Jun 2020 19:42:14 -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: fdf6017fa Fix event for unlucky composts b567cb433 SPIGOT-5910: loadAdvancement does not work --- Spigot-Server-Patches/0004-MC-Utils.patch | 4 ++-- Spigot-Server-Patches/0009-Timings-v2.patch | 6 +++--- .../0018-Implement-Paper-VersionChecker.patch | 4 ++-- .../0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch | 4 ++-- .../0443-Add-Raw-Byte-ItemStack-Serialization.patch | 4 ++-- work/CraftBukkit | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index f5ae61c3e..67a871400 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -4685,10 +4685,10 @@ index 0000000000000000000000000000000000000000..49dc0c441b9dd7e7745cf15ced67f383 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java -index 99a49ae13697940c2055f37df3c8c2e8383ecee9..7d66cc8e5e4a0f6710f12df8b75cc05bbc152c0b 100644 +index eb87f3720977e4e980d26e9cfd4fed0a808636dd..b6c39bf77e716addc9d2a1e915687bc770e937f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java -@@ -188,4 +188,22 @@ public class DummyGeneratorAccess implements GeneratorAccess { +@@ -187,4 +187,22 @@ public class DummyGeneratorAccess implements GeneratorAccess { public boolean a(BlockPosition blockposition, boolean flag, Entity entity, int i) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index db30bc9bf..87714a6e3 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -2155,10 +2155,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 fbd533badfd2dc7cac1fe33a12b08b06bbd17179..94c28fe3dcf4f5a673f704e7b21be40b0cd6568e 100644 +index de168983ea04519c4951216621b3493245bd8383..b3b2ad576137d0383f43ec444f2353ecad3743d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -134,6 +134,12 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -137,6 +137,12 @@ public final class CraftMagicNumbers implements UnsafeValues { return CraftNamespacedKey.toMinecraft(mat.getKey()); } // ======================================================================== @@ -2171,7 +2171,7 @@ index fbd533badfd2dc7cac1fe33a12b08b06bbd17179..94c28fe3dcf4f5a673f704e7b21be40b public static byte toLegacyData(IBlockData data) { return CraftLegacy.toLegacyData(data); -@@ -303,6 +309,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -309,6 +315,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 504ca209a..638e6c790 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 94c28fe3dcf4f5a673f704e7b21be40b0cd6568e..820f338a32e73bbb8913c1a52a7c2a40d7d97324 100644 +index b3b2ad576137d0383f43ec444f2353ecad3743d9..b87b2eacc9a89c79d18c4c2168aca9f5ca953c81 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -314,6 +314,11 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -320,6 +320,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 c51ac82b6..ab71bf1a6 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 820f338a32e73bbb8913c1a52a7c2a40d7d97324..997fdf363ee3e0610659b03e2f303d9f3e049000 100644 +index b87b2eacc9a89c79d18c4c2168aca9f5ca953c81..ac9105c23cbe36dfbebfff63e074065b8f472c0e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -319,6 +319,11 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -325,6 +325,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 b19669d68..1bafe6495 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 997fdf363ee3e0610659b03e2f303d9f3e049000..257f46003fc3203c67c029f3ddc73516cf02674f 100644 +index ac9105c23cbe36dfbebfff63e074065b8f472c0e..f1e60981abc46807f8004f0ac49127a2bb83fc42 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -324,6 +324,46 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -330,6 +330,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 7560f5f5a..fdf6017fa 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 7560f5f5a69fc5fa17ec0c33eaba8abe026a53ef +Subproject commit fdf6017fa9ea64ddcfa2f2a7d69cda824b381b38