From 9087993febc2b0bc25f1a146f35c3a3434810804 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com>
Date: Tue, 21 Sep 2021 21:59:19 -0700
Subject: [PATCH] Mark fish and axolotls from buckets as persistent (#6392)

---
 ...-axolotls-from-buckets-as-persistent.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch

diff --git a/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
new file mode 100644
index 0000000000..fceabe1e81
--- /dev/null
+++ b/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Fri, 13 Aug 2021 16:38:08 -0700
+Subject: [PATCH] Mark fish and axolotls from buckets as persistent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
+index fc0cd86397b12e42756273a0317164d79ac51937..76cb5ba6023a8d019b5f4c8c2cedbc8e0fd04886 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
++++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
+@@ -90,7 +90,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+     @Override
+     public void setFromBucket(boolean fromBucket) {
+         this.entityData.set(AbstractFish.FROM_BUCKET, fromBucket);
+-        this.setPersistenceRequired(this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence
++        this.setPersistenceRequired(fromBucket); // CraftBukkit - SPIGOT-4106 update persistence // Paper - actually set as persistent
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+index fa365420a4593bc7d652b0d92f4750602fcb334b..d041e6f9c01549bb15f3d68ff1fd3bcc3458482b 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+@@ -236,7 +236,7 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
+     @Override
+     public void setFromBucket(boolean fromBucket) {
+         this.entityData.set(Axolotl.FROM_BUCKET, fromBucket);
+-        this.setPersistenceRequired(this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence
++        this.setPersistenceRequired(fromBucket); // CraftBukkit - SPIGOT-4106 update persistence // Paper - actually set as persistent
+     }
+ 
+     @Nullable