mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#11626)

Browse source 
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
This commit is contained in:
Bjarne Koll 2024-11-17 16:52:44 +01:00 • committed by GitHub
parent be886cf4e7
commit 7b13d936de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 13 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

28
patches/api/0053-Fix-upstream-javadocs.patch
View file

@ -1702,10 +1702,10 @@ index 43f0df04f3cdff7d7db73321a2886f3a737e3c9f..5c741228b2338a7c4de2fe736eb78951
public interface OminousBottleMeta extends ItemMeta {
diff --git a/src/main/java/org/bukkit/inventory/meta/components/UseCooldownComponent.java b/src/main/java/org/bukkit/inventory/meta/components/UseCooldownComponent.java
index 04b4b08021a841542b3d5e6f3f1c465af3899281..8eb18671dd0f93eac143e8449dbee43d49e50621 100644
index 4086a413895f82b51bf192ceffdfee4a939c6fed..172032e56ee8e4e1b13ec6b41a5122a33b18bc64 100644
--- a/src/main/java/org/bukkit/inventory/meta/components/UseCooldownComponent.java
+++ b/src/main/java/org/bukkit/inventory/meta/components/UseCooldownComponent.java
@@ -6,25 +6,24 @@ import org.jetbrains.annotations.ApiStatus;
@@ -6,8 +6,7 @@ import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
/**
@ -1715,29 +1715,7 @@ index 04b4b08021a841542b3d5e6f3f1c465af3899281..8eb18671dd0f93eac143e8449dbee43d
*/
@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.
@@ -37,7 +36,7 @@ public interface UseCooldownComponent extends ConfigurationSerializable {
@@ -39,7 +38,7 @@ public interface UseCooldownComponent extends ConfigurationSerializable {
/**
* Sets the custom cooldown group to be used for similar items.
*