From a768ea0ddfb8109981733da35ccc8f708b0d0951 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 12 Nov 2024 20:37:58 +1100 Subject: [PATCH] SPIGOT-7953: Item cooldown must be greater than 0 By: md_5 --- .../org/bukkit/craftbukkit/inventory/CraftMetaItem.java | 2 +- .../inventory/components/CraftUseCooldownComponent.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index 325fd58aaa..d947ee43a8 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1488,7 +1488,7 @@ 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)); } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java index a316eb6242..4ff2a11130 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftUseCooldownComponent.java @@ -54,10 +54,10 @@ public final class CraftUseCooldownComponent implements UseCooldownComponent { } @Override - public void setCooldownSeconds(float eatSeconds) { - Preconditions.checkArgument(eatSeconds >= 0, "eatSeconds cannot be less than 0"); + public void setCooldownSeconds(float cooldown) { + Preconditions.checkArgument(cooldown > 0, "cooldown must be greater than 0"); - handle = new UseCooldown(eatSeconds, handle.cooldownGroup()); + handle = new UseCooldown(cooldown, handle.cooldownGroup()); } @Override