mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
2fbbafa299
Upstream has released updates that appears to apply and compile correctly Paper Changes: 9dfe1321 Delay Chunk Unloads based on Player Movement f0409edc Drop Close region files patch, doesn't add any value. 700070c5 Fix undesirable behavior around world level changes due to priority
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 13c58b12b39ccbb8c0edfaeb2140675662054e12 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.26.2
|
|
|