Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
8ce3dd5f [CI-SKIP] Fix Mojang API Brigadier dep - THIS IS NOT A NEW BUILD
00d760a5 Fix build due to spigot changing the build timestamp process
842e040c Updated Upstream (Bukkit/CraftBukkit/Spigot)
c03260a2 Add getter and setter for villager's numberOfRestocksToday (#3231)
fe366fbe null check tracker for entity metadata update - Fixes #3070
fdf41b74 Implement Brigadier Mojang API
e0ea2e0e Entity Activation Range 2.0! Major improvements to restoring behavior
10396d28 Fix Tracking Range mismatch on Vehicle/Passenger checks
This commit is contained in:
William Blake Galbreath
2020-04-28 20:14:57 -05:00
parent c0e748c0c1
commit a2db5eebbe
67 changed files with 269 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,41 @@
From af3cd5ffa01ba64385f406055fce4fb330e6a401 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Mon, 20 Apr 2020 13:57:06 +0200
Subject: [PATCH] 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.24.0