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

1.14.4 - Updated Upstream (Paper)

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

Paper Changes:
9fe63a16 Update to 1.14.4 (#2333)
This commit is contained in:
William Blake Galbreath
2019-07-19 23:59:11 -05:00
parent 6ea93ffa52
commit c3fd092026
27 changed files with 351 additions and 3377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0004-PlayerFeedAnimalEvent.patch
View File

@@ -1,4 +1,4 @@
From c104ebc514f96b6289079924d701f44951f29305 Mon Sep 17 00:00:00 2001
From 18594b78ebeec10cb1e526a1a7d61fe03688209a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:39:38 -0500
Subject: [PATCH] PlayerFeedAnimalEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] PlayerFeedAnimalEvent
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
index eab32ec041..38920dab9e 100644
index 3e627ea08b..7b3d4fbd95 100644
--- a/src/main/java/net/minecraft/server/EntityAnimal.java
+++ b/src/main/java/net/minecraft/server/EntityAnimal.java
@@ -103,6 +103,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -25,7 +25,7 @@ index eab32ec041..38920dab9e 100644
- if (this.i(itemstack)) {
+ if (this.i(itemstack) && new net.pl3x.purpur.event.PlayerFeedAnimalEvent((org.bukkit.entity.Animals) getBukkitEntity(), (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), itemstack.asBukkitCopy()).callEvent()) { // Purpur
if (this.getAge() == 0 && this.eb()) {
if (this.getAge() == 0 && this.ea()) {
this.a(entityhuman, itemstack);
this.f(entityhuman);
--