summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-10-07 10:08:58 +1100
committermd_5 <git@md-5.net>2018-10-07 10:08:58 +1100
commit8ab46ff7c68434c9be24f191ce0126b656a86a0d (patch)
treedc01c4a915d0831c2d25669cab78da701e856919
parent1ceee63341927e71e23293be6cb7466bd3045e9e (diff)
downloadcraftbukkit-8ab46ff7c68434c9be24f191ce0126b656a86a0d.tar
craftbukkit-8ab46ff7c68434c9be24f191ce0126b656a86a0d.tar.gz
craftbukkit-8ab46ff7c68434c9be24f191ce0126b656a86a0d.tar.lz
craftbukkit-8ab46ff7c68434c9be24f191ce0126b656a86a0d.tar.xz
craftbukkit-8ab46ff7c68434c9be24f191ce0126b656a86a0d.zip
SPIGOT-4368: Tweak fish persistence
-rw-r--r--nms-patches/EntityFish.patch11
1 files changed, 10 insertions, 1 deletions
diff --git a/nms-patches/EntityFish.patch b/nms-patches/EntityFish.patch
index c4b05830..0fe7401b 100644
--- a/nms-patches/EntityFish.patch
+++ b/nms-patches/EntityFish.patch
@@ -1,10 +1,19 @@
--- a/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 @@
public void setFromBucket(boolean 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) {