mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
c0c212bf48
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 0d10025c6a251f2c362d2adaf372fce754ac92fb Mon Sep 17 00:00:00 2001
|
|
From: KennyTV <kennytv@t-online.de>
|
|
Date: Mon, 20 Apr 2020 13:57:06 +0200
|
|
Subject: [PATCH] PaperPR - 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 27cde8c155..3c3bcc7f91 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.24.0
|
|
|