diff --git a/patches/api/0033-PlayerItemCooldownEvent.patch b/patches/api/0033-PlayerItemCooldownEvent.patch new file mode 100644 index 000000000..955c840e4 --- /dev/null +++ b/patches/api/0033-PlayerItemCooldownEvent.patch @@ -0,0 +1,95 @@ +From 10e5fbce2f6b8d5522007d1d61abce2a22d4117f Mon Sep 17 00:00:00 2001 +From: KennyTV <28825609+KennyTV@users.noreply.github.com> +Date: Sat, 31 Aug 2019 17:39:47 +0200 +Subject: [PATCH] PlayerItemCooldownEvent + +--- + .../event/player/PlayerItemCooldownEvent.java | 76 +++++++++++++++++++ + 1 file changed, 76 insertions(+) + create mode 100644 src/main/java/com/destroystokyo/paper/event/player/PlayerItemCooldownEvent.java + +diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerItemCooldownEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerItemCooldownEvent.java +new file mode 100644 +index 000000000..6ae9fae4f +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerItemCooldownEvent.java +@@ -0,0 +1,76 @@ ++package com.destroystokyo.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; ++ } ++} +-- +2.24.0 + diff --git a/patches/server/0111-PlayerItemCooldownEvent.patch b/patches/server/0111-PlayerItemCooldownEvent.patch new file mode 100644 index 000000000..e62a1bdff --- /dev/null +++ b/patches/server/0111-PlayerItemCooldownEvent.patch @@ -0,0 +1,44 @@ +From 289db8fcf661720f28cca2336e572bbe69c9b43f Mon Sep 17 00:00:00 2001 +From: KennyTV <28825609+KennyTV@users.noreply.github.com> +Date: Sat, 31 Aug 2019 17:40:04 +0200 +Subject: [PATCH] PlayerItemCooldownEvent + +--- + .../net/minecraft/server/ItemCooldownPlayer.java | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +index 27cde8c155..2b8afef1ac 100644 +--- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java ++++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +@@ -1,13 +1,26 @@ + package net.minecraft.server; + ++import com.destroystokyo.paper.event.player.PlayerItemCooldownEvent; // Purpur ++ + 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) { ++ PlayerItemCooldownEvent event = new PlayerItemCooldownEvent(getEntityPlayer().getBukkitEntity(), org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(item), ticks); ++ if (!event.callEvent()) { ++ return; ++ } ++ super.setCooldown(item, event.getCooldown()); ++ } ++ // Purpur end ++ + @Override + protected void b(Item item, int i) { + super.b(item, i); +-- +2.24.0 +