diff --git a/patches/api/0034-PlayerItemCooldownEvent.patch b/patches/api/0034-PlayerItemCooldownEvent.patch new file mode 100644 index 000000000..99c34437a --- /dev/null +++ b/patches/api/0034-PlayerItemCooldownEvent.patch @@ -0,0 +1,96 @@ +From f4a853766da3be371ba55bba97c3e8b2f0aaefd9 Mon Sep 17 00:00:00 2001 +From: KennyTV +Date: Mon, 20 Apr 2020 13:57:13 +0200 +Subject: [PATCH] PlayerItemCooldownEvent + +--- + .../event/player/PlayerItemCooldownEvent.java | 77 +++++++++++++++++++ + 1 file changed, 77 insertions(+) + create mode 100644 src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java + +diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java +new file mode 100644 +index 00000000..ffc2512e +--- /dev/null ++++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java +@@ -0,0 +1,77 @@ ++package net.pl3x.purpur.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; ++ ++/** ++ * Called when a player receives a cooldown on an item. ++ */ ++public final class PlayerItemCooldownEvent extends PlayerEvent implements Cancellable { ++ private static final HandlerList handlers = new HandlerList(); ++ @NotNull ++ private final Material type; ++ private int cooldown; ++ private boolean cancelled; ++ ++ 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) { ++ cancelled = cancel; ++ } ++ ++ @Override ++ @NotNull ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return handlers; ++ } ++} +-- +2.26.1.windows.1 + diff --git a/patches/server/0123-PlayerItemCooldownEvent.patch b/patches/server/0123-PlayerItemCooldownEvent.patch new file mode 100644 index 000000000..a0ad77650 --- /dev/null +++ b/patches/server/0123-PlayerItemCooldownEvent.patch @@ -0,0 +1,41 @@ +From f3bd62e552aed846b8c1b902292254e376de8430 Mon Sep 17 00:00:00 2001 +From: KennyTV +Date: Mon, 20 Apr 2020 13:57:06 +0200 +Subject: [PATCH] PlayerItemCooldownEvent + +--- + .../net/minecraft/server/ItemCooldownPlayer.java | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +index 27cde8c1..3c3bcc7f 100644 +--- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java ++++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +@@ -2,12 +2,23 @@ package net.minecraft.server; + + public class ItemCooldownPlayer extends ItemCooldown { + +- private final EntityPlayer a; ++ private final EntityPlayer a; public EntityPlayer getEntityPlayer() { return a; } // Purpur - OBFHELPER + + public ItemCooldownPlayer(EntityPlayer entityplayer) { + this.a = entityplayer; + } + ++ // Purpur start ++ @Override ++ public void setCooldown(Item item, int ticks) { ++ net.pl3x.purpur.event.player.PlayerItemCooldownEvent event = ++ new net.pl3x.purpur.event.player.PlayerItemCooldownEvent(getEntityPlayer().getBukkitEntity(), org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(item), ticks); ++ if (event.callEvent()) { ++ super.setCooldown(item, event.getCooldown()); ++ } ++ } ++ // Purpur end ++ + @Override + protected void b(Item item, int i) { + super.b(item, i); +-- +2.26.1.windows.1 +