mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 04:09:54 +01:00
976c6d425b
A recent commit has been made that caused patches to be out of order, rebuilding
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: KennyTV <jahnke.nassim@gmail.com>
|
|
Date: Tue, 25 Aug 2020 13:48:33 +0200
|
|
Subject: [PATCH] Add PlayerItemCooldownEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java b/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java
|
|
index 5f70e39f4da2880a6f734a225be83061b00847c8..ef9ffad211473f1cbcd0b8fd200ff04ec2051f94 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java
|
|
@@ -3,14 +3,26 @@ package net.minecraft.world.item;
|
|
import net.minecraft.network.protocol.game.PacketPlayOutSetCooldown;
|
|
import net.minecraft.server.level.EntityPlayer;
|
|
|
|
+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);
|