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
This commit is contained in:
Bjarne Koll
2024-11-17 16:52:44 +01:00
parent 5a9b3c9e23
commit 7c03ce11ef
7 changed files with 5 additions and 49 deletions

View File

@@ -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.