From 8ab46ff7c68434c9be24f191ce0126b656a86a0d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 7 Oct 2018 10:08:58 +1100
Subject: [PATCH] SPIGOT-4368: Tweak fish persistence

---
 nms-patches/EntityFish.patch | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nms-patches/EntityFish.patch b/nms-patches/EntityFish.patch
index c4b05830e3..0fe7401b08 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) {