From 2a44498a547784f2e3361a10384f642726d6cb55 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Tue, 25 Aug 2020 14:01:03 +0200 Subject: [PATCH] Add PlayerItemCooldownEvent --- LICENSE.md | 1 + ...99-Add-item-slot-convenience-methods.patch | 2 +- .../0238-Add-PlayerItemCooldownEvent.patch | 89 +++++++++++++++++++ .../0606-Add-PlayerItemCooldownEvent.patch | 37 ++++++++ 4 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 Spigot-API-Patches/0238-Add-PlayerItemCooldownEvent.patch create mode 100644 Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch diff --git a/LICENSE.md b/LICENSE.md index 88621689a..2e6c2acc6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -43,4 +43,5 @@ DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> JRoy Robert Norman , ysl3000 +KennyTV ``` diff --git a/Spigot-API-Patches/0199-Add-item-slot-convenience-methods.patch b/Spigot-API-Patches/0199-Add-item-slot-convenience-methods.patch index ee23ec1af..269799d87 100644 --- a/Spigot-API-Patches/0199-Add-item-slot-convenience-methods.patch +++ b/Spigot-API-Patches/0199-Add-item-slot-convenience-methods.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: KennyTV +From: KennyTV Date: Sat, 25 Apr 2020 23:31:28 +0200 Subject: [PATCH] Add item slot convenience methods diff --git a/Spigot-API-Patches/0238-Add-PlayerItemCooldownEvent.patch b/Spigot-API-Patches/0238-Add-PlayerItemCooldownEvent.patch new file mode 100644 index 000000000..3bf6084e1 --- /dev/null +++ b/Spigot-API-Patches/0238-Add-PlayerItemCooldownEvent.patch @@ -0,0 +1,89 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: KennyTV +Date: Tue, 25 Aug 2020 13:45:15 +0200 +Subject: [PATCH] Add PlayerItemCooldownEvent + + +diff --git a/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..58d18f05af13d836ddc62fcd30befcb06f07c57c +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/player/PlayerItemCooldownEvent.java +@@ -0,0 +1,77 @@ ++package io.papermc.paper.event.player; ++ ++import com.google.common.base.Preconditions; ++import org.bukkit.Material; ++import org.bukkit.entity.Player; ++import org.bukkit.event.Cancellable; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.player.PlayerEvent; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Fired when a player receives an item cooldown. ++ */ ++public class PlayerItemCooldownEvent extends PlayerEvent implements Cancellable { ++ private static final HandlerList handlers = new HandlerList(); ++ @NotNull ++ private final Material type; ++ private boolean cancelled; ++ private int cooldown; ++ ++ public PlayerItemCooldownEvent(@NotNull Player player, @NotNull Material type, int cooldown) { ++ super(player); ++ this.type = type; ++ this.cooldown = cooldown; ++ } ++ ++ /** ++ * Get the material affected by the cooldown. ++ * ++ * @return material affected by the cooldown ++ */ ++ @NotNull ++ public Material getType() { ++ return type; ++ } ++ ++ /** ++ * Gets the cooldown in ticks. ++ * ++ * @return cooldown in ticks ++ */ ++ public int getCooldown() { ++ return cooldown; ++ } ++ ++ /** ++ * Sets the cooldown of the material in ticks. ++ * Setting the cooldown to 0 results in removing an already existing cooldown for the material. ++ * ++ * @param cooldown cooldown in ticks, has to be a positive number ++ */ ++ public void setCooldown(int cooldown) { ++ Preconditions.checkArgument(cooldown >= 0, "The cooldown has to be equal to or greater than 0!"); ++ this.cooldown = cooldown; ++ } ++ ++ @Override ++ public boolean isCancelled() { ++ return cancelled; ++ } ++ ++ @Override ++ public void setCancelled(boolean cancel) { ++ this.cancelled = cancel; ++ } ++ ++ @NotNull ++ @Override ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return handlers; ++ } ++} diff --git a/Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch b/Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch new file mode 100644 index 000000000..1b1c12a35 --- /dev/null +++ b/Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: KennyTV +Date: Tue, 25 Aug 2020 13:48:33 +0200 +Subject: [PATCH] Add PlayerItemCooldownEvent + + +diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +index 27cde8c15576efab9a60b5741c1cd54ed4b04c6c..9da02cf0a9a1b396c2ff0f79fdd2e95003399817 100644 +--- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java ++++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +@@ -1,13 +1,25 @@ + package net.minecraft.server; + ++import io.papermc.paper.event.player.PlayerItemCooldownEvent; // Paper ++ + public class ItemCooldownPlayer extends ItemCooldown { + +- private final EntityPlayer a; ++ private final EntityPlayer a; public EntityPlayer getEntityPlayer() { return a; } // Paper - OBFHELPER + + public ItemCooldownPlayer(EntityPlayer entityplayer) { + this.a = entityplayer; + } + ++ // Paper start ++ @Override ++ public void setCooldown(Item item, int ticks) { ++ PlayerItemCooldownEvent event = new PlayerItemCooldownEvent(getEntityPlayer().getBukkitEntity(), org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(item), ticks); ++ if (event.callEvent()) { ++ super.setCooldown(item, event.getCooldown()); ++ } ++ } ++ // Paper end ++ + @Override + protected void b(Item item, int i) { + super.b(item, i);