Remove PlayerItemCooldownEvent (causes crashes)

This commit is contained in:
William Blake Galbreath
2020-03-25 19:31:13 -05:00
parent 86c5a55f46
commit d4e8659c65
4 changed files with 2 additions and 141 deletions

View File

@@ -1,4 +1,4 @@
From 48c7256ee3cf1a21d8a830f12d7d5a37d859c741 Mon Sep 17 00:00:00 2001
From 2f096707e346177eeb7d8dc35357e1cec49a26e8 Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Mon, 24 Jun 2019 21:27:32 -0700
Subject: [PATCH] Add BellRingEvent

View File

@@ -1,44 +0,0 @@
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