Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,19 +1,19 @@
--- a/net/minecraft/server/EntityFish.java
+++ b/net/minecraft/server/EntityFish.java
@@ -29,7 +29,7 @@
}
@@ -36,7 +36,7 @@
public boolean isTypeNotPersistent() {
@Override
public boolean isTypeNotPersistent(double d0) {
- return !this.isFromBucket() && !this.hasCustomName();
+ return true; // CraftBukkit
}
public int dg() {
@@ -47,6 +47,7 @@
@Override
@@ -56,6 +56,7 @@
public void setFromBucket(boolean flag) {
this.datawatcher.set(EntityFish.a, flag);
this.datawatcher.set(EntityFish.FROM_BUCKET, flag);
+ this.persistent = this.isPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
}
public void b(NBTTagCompound nbttagcompound) {
@Override