From 7c03ce11efdf5701bc93b27c869c7b26b28cfa41 Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Sun, 17 Nov 2024 16:52:44 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#11626) 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: 36b11391 Fix copy pasting in UseCooldownComponent CraftBukkit Changes: a71a7e1f5 SPIGOT-7957: Fix setTarget method for Breeze 5bc0a094b SPIGOT-7955: Failure teleporting players between worlds using Player#teleport() when player has attribute modifiers 2e09c7a36 SPIGOT-7953: Item cooldown must be greater than 0 8ef9079fa Increase outdated build delay --- patches/api/Fix-upstream-javadocs.patch | 22 ------------------- patches/server/Build-system-changes.patch | 2 +- .../Expose-server-build-information.patch | 2 +- patches/server/Fix-this-stupid-bullshit.patch | 2 +- patches/server/General-ItemMeta-fixes.patch | 22 ------------------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 7 files changed, 5 insertions(+), 49 deletions(-) diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch index fb51285f51..6d6c18bcc4 100644 --- a/patches/api/Fix-upstream-javadocs.patch +++ b/patches/api/Fix-upstream-javadocs.patch @@ -1715,28 +1715,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 */ @ApiStatus.Experimental public interface UseCooldownComponent extends ConfigurationSerializable { - - /** -- * Gets the time in seconds it will take for this item to be eaten. -+ * Gets the time in seconds it will take for this item to be available for use again. - * -- * @return eat time -+ * @return cooldown time - */ - float getCooldownSeconds(); - - /** -- * Sets the time in seconds it will take for this item to be eaten. -+ * Sets the time in seconds it will take for this item to be available for use again. - * -- * @param eatSeconds new eat time, must be positive -+ * @param cooldownSeconds new cooldown time, must be positive - */ -- void setCooldownSeconds(float eatSeconds); -+ void setCooldownSeconds(float cooldownSeconds); - - /** - * Gets the custom cooldown group to be used for similar items, if set. @@ -0,0 +0,0 @@ public interface UseCooldownComponent extends ConfigurationSerializable { /** * Sets the custom cooldown group to be used for similar items. diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index bf365ad5e7..96411b1e69 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -142,7 +142,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd 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, -14); 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/Expose-server-build-information.patch b/patches/server/Expose-server-build-information.patch index fcea6472d0..f73002ae24 100644 --- a/patches/server/Expose-server-build-information.patch +++ b/patches/server/Expose-server-build-information.patch @@ -671,7 +671,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public static boolean useConsole = true; @@ -0,0 +0,0 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -14); 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/Fix-this-stupid-bullshit.patch b/patches/server/Fix-this-stupid-bullshit.patch index 2748352d35..338ff9d49a 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, -14); 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/General-ItemMeta-fixes.patch b/patches/server/General-ItemMeta-fixes.patch index e858bdc8f3..4cff660718 100644 --- a/patches/server/General-ItemMeta-fixes.patch +++ b/patches/server/General-ItemMeta-fixes.patch @@ -1193,15 +1193,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.useRemainder = useRemainder; } -@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { - - @Override - public UseCooldownComponent getUseCooldown() { -- return (this.hasUseCooldown()) ? new CraftUseCooldownComponent(this.useCooldown) : new CraftUseCooldownComponent(new UseCooldown(0)); -+ return (this.hasUseCooldown()) ? new CraftUseCooldownComponent(this.useCooldown) : new CraftUseCooldownComponent(new UseCooldown(1.0F)); // Paper - Create a valid use_cooldown component - } - - @Override @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @Override @@ -2109,19 +2100,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.handle = new Tool.Rule(this.handle.blocks(), Optional.ofNullable(speed), this.handle.correctForDrops()); } -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java -@@ -0,0 +0,0 @@ public final class CraftUseCooldownComponent implements UseCooldownComponent { - - @Override - public void setCooldownSeconds(float eatSeconds) { -- Preconditions.checkArgument(eatSeconds >= 0, "eatSeconds cannot be less than 0"); -+ Preconditions.checkArgument(eatSeconds > 0, "eatSeconds must be positive"); // Paper - - this.handle = new UseCooldown(eatSeconds, this.handle.cooldownGroup()); - } diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/DeprecatedItemMetaCustomValueTest.java diff --git a/work/Bukkit b/work/Bukkit index a6aba46fe6..36b11391a2 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit a6aba46fe6679624f7c9cbeb6c2d1be63156e6bb +Subproject commit 36b11391a2c0213669acfa9b863a3a3704374fbc diff --git a/work/CraftBukkit b/work/CraftBukkit index 2702c5c8e5..a71a7e1f57 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2702c5c8e5e1a9e3d231d9006afa80333c84caa4 +Subproject commit a71a7e1f57653334d66e389d162a437b1491bfc8