Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
70df8f27 Add PrepareGrindstoneEvent
24b2f54b Fix Player skulls for offline mode servers
ce270e14 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c4ada0e1 Fix many chunk loading issues
37b244b5 Fix not running level updates for light if no pre/post task
e6142995 Add and implement PlayerRecipeBookClickEvent (#3351)
9bb4e930 Fix piston dupe patch creating ghost blocks (#3603)
This commit is contained in:
William Blake Galbreath
2020-06-23 14:20:44 -05:00
parent 07c44e35f2
commit 05a85435d2
27 changed files with 115 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
patches/server/0123-PaperPR-PlayerItemCooldownEvent.patch Normal file
View File

@@ -0,0 +1,41 @@
From 4ccb3f307363426180c14b91fd024e297f003f8e 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 27cde8c15..3c3bcc7f9 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