SPIGOT-4368: Tweak fish persistence

This commit is contained in:
md_5 2018-10-07 10:08:58 +11:00
parent 1ceee63341
commit 8ab46ff7c6

View file

@ -1,10 +1,19 @@
--- a/net/minecraft/server/EntityFish.java --- a/net/minecraft/server/EntityFish.java
+++ b/net/minecraft/server/EntityFish.java +++ b/net/minecraft/server/EntityFish.java
@@ -37,7 +37,7 @@
}
protected boolean isTypeNotPersistent() {
- return !this.isFromBucket() && !this.hasCustomName();
+ return true; // CraftBukkit
}
public boolean l() {
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
public void setFromBucket(boolean flag) { public void setFromBucket(boolean flag) {
this.datawatcher.set(EntityFish.b, Boolean.valueOf(flag)); this.datawatcher.set(EntityFish.b, Boolean.valueOf(flag));
+ this.persistent = !this.isTypeNotPersistent(); // CraftBukkit - SPIGOT-4106 update persistence + this.persistent = this.isPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
} }
public void b(NBTTagCompound nbttagcompound) { public void b(NBTTagCompound nbttagcompound) {