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

Update to 1.14

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-06 22:37:10 -05:00
committed by BillyGalbreath
parent a4bfd94c63
commit b8fed8aaf2
16 changed files with 726 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0002-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 406e7fabf130b3e736f3eb27569874723f4e44d8 Mon Sep 17 00:00:00 2001
From 77b4e1d3418d77638669726c7b9bccb3325f28a1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -9,22 +9,22 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 581c78e00..89a8bbe33 100644
index 23f910187..7bdc0f4a5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1082,6 +1082,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -995,6 +995,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
+ public void playSound(SoundEffect soundeffect, float volume, float pitch) { a(soundeffect, volume, pitch); } // Paper - OBFHELPER
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.bV(), f, f1);
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1);
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index cc53e915d..efd2a0ee7 100644
index d2c2e3cc3..0139688c7 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -21,7 +21,7 @@ public class EntityCow extends EntityAnimal {
@@ -16,7 +16,7 @@ public class EntityCow extends EntityAnimal {
this.goalSelector.a(0, new PathfinderGoalFloat(this));
this.goalSelector.a(1, new PathfinderGoalPanic(this, 2.0D));
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
@@ -33,16 +33,16 @@ index cc53e915d..efd2a0ee7 100644
this.goalSelector.a(4, new PathfinderGoalFollowParent(this, 1.25D));
this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
@@ -59,6 +59,8 @@ public class EntityCow extends EntityAnimal {
return LootTables.S;
@@ -55,6 +55,8 @@ public class EntityCow extends EntityAnimal {
return 0.4F;
}
+ private int mushroomsFed = 0; // Purpur
+
@Override
public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.b(enumhand);
@@ -82,6 +84,47 @@ public class EntityCow extends EntityAnimal {
@@ -79,6 +81,47 @@ public class EntityCow extends EntityAnimal {
// CraftBukkit end
return true;