From 36b107516b8b18f5da9cb58034c01f73d0a363ca Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 17 Jun 2021 14:50:16 +0200 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: 2dbec584 SPIGOT-6570: Missing InventoryType: COMPOSTER e9ce88b9 SPIGOT-6562: Add more specific sculk sensor event CraftBukkit Changes: 9122f5a6 #869: Fix BossBar setColor and setStyle updates 96a15d7a Incrase outdated build delay ded19075 SPIGOT-6570: Missing InventoryType: COMPOSTER d7ef1e91 SPIGOT-6558: Attempt to improve SkullMeta e7a63287 SPIGOT-6562: Add more specific sculk sensor event Spigot Changes: 101ebb63 SPIGOT-6573: Berry Bushes deal damage when not moving --- patches/server/Build-system-changes.patch | 2 +- patches/server/Entity-Activation-Range-2.0.patch | 2 +- patches/server/Fix-this-stupid-bullshit.patch | 2 +- .../Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | 2 +- patches/server/Timings-v2.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index ee9f79dfa6..84fafdc164 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -7); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/patches/server/Entity-Activation-Range-2.0.patch index 6cc6e018a9..9bbcce2a1b 100644 --- a/patches/server/Entity-Activation-Range-2.0.patch +++ b/patches/server/Entity-Activation-Range-2.0.patch @@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + timer = isActive ? entity.getType().tickTimer.startTiming() : entity.getType().inactiveTickTimer.startTiming(); // Paper try { // Paper end - timings - entity.isInLava(); + entity.setOldPosAndRot(); @@ -0,0 +0,0 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl return Registry.ENTITY_TYPE.getKey(entity.getType()).toString(); }); diff --git a/patches/server/Fix-this-stupid-bullshit.patch b/patches/server/Fix-this-stupid-bullshit.patch index 8afd4de533..25c7fdd43f 100644 --- a/patches/server/Fix-this-stupid-bullshit.patch +++ b/patches/server/Fix-this-stupid-bullshit.patch @@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -7); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit diff --git a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index c78c5133d1..9a80ee0af2 100644 --- a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -7); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); diff --git a/patches/server/Timings-v2.patch b/patches/server/Timings-v2.patch index d3f4fcb4ea..f94075712b 100644 --- a/patches/server/Timings-v2.patch +++ b/patches/server/Timings-v2.patch @@ -1338,7 +1338,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + timer = entity.getVehicle() != null ? entity.getType().passengerTickTimer.startTiming() : entity.getType().tickTimer.startTiming(); + try { + // Paper end - timings - entity.isInLava(); + entity.setOldPosAndRot(); ProfilerFiller gameprofilerfiller = this.getProfiler(); @@ -0,0 +0,0 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/work/Bukkit b/work/Bukkit index ebb0e28d11..2dbec58427 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit ebb0e28d11747aa0bb4bb39fad8979ccfaa925b6 +Subproject commit 2dbec584278268fc46bfb5520fd18bde18d33308 diff --git a/work/CraftBukkit b/work/CraftBukkit index f992ce6097..9122f5a6e0 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10 +Subproject commit 9122f5a6e02e52b50ba61b8073137365d1167f30 diff --git a/work/Spigot b/work/Spigot index 9472b09d5f..101ebb63b2 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 9472b09d5fa46afc41871d063689b5ddd89764b3 +Subproject commit 101ebb63b2531abf0ac868af41d57322d05931fa