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

Update to 1.14.3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-25 21:12:19 -05:00
parent 5d6c6b7efa
commit 4bc7fbcdfa
23 changed files with 444 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 85502589238590465c50bdff0c2283ce3b021fa4 Mon Sep 17 00:00:00 2001
From c104ebc514f96b6289079924d701f44951f29305 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,10 +8,10 @@ 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 dbce8a866..8a4594654 100644
index eab32ec041..38920dab9e 100644
--- a/src/main/java/net/minecraft/server/EntityAnimal.java
+++ b/src/main/java/net/minecraft/server/EntityAnimal.java
@@ -110,6 +110,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -103,6 +103,7 @@ public abstract class EntityAnimal extends EntityAgeable {
return 1 + this.world.random.nextInt(3);
}
@@ -19,13 +19,13 @@ index dbce8a866..8a4594654 100644
public boolean i(ItemStack itemstack) {
return itemstack.getItem() == Items.WHEAT;
}
@@ -118,7 +119,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -111,7 +112,7 @@ public abstract class EntityAnimal extends EntityAgeable {
public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.b(enumhand);
- if (this.i(itemstack)) {
+ if (this.isBreedingItem(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.ea()) {
+ 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()) {
this.a(entityhuman, itemstack);
this.f(entityhuman);
--