From 2ea6aee343284afb2224774cf6a7f97a5f8d4327 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sun, 12 Jan 2025 21:49:25 +0100
Subject: [PATCH] Deprecate Turtle#isDigging (#11959)

---
 paper-api/src/main/java/org/bukkit/entity/Turtle.java     | 8 +++++---
 .../level/block/entity/BrewingStandBlockEntity.java.patch | 5 +++--
 .../java/org/bukkit/craftbukkit/entity/CraftTurtle.java   | 7 -------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Turtle.java b/paper-api/src/main/java/org/bukkit/entity/Turtle.java
index aa83615a0..3b26e9e48 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Turtle.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Turtle.java
@@ -22,7 +22,6 @@ public interface Turtle extends Animals {
      */
     boolean isLayingEgg();
 
-    // Paper start
     /**
      * Get the turtle's home location
      *
@@ -49,8 +48,12 @@ public interface Turtle extends Animals {
      * Get if turtle is digging to lay eggs
      *
      * @return True if digging
+     * @deprecated in favor of {@link #isLayingEgg()}
      */
-    boolean isDigging();
+    @Deprecated(since = "1.21.4")
+    default boolean isDigging() {
+        return this.isLayingEgg();
+    }
 
     /**
      * Set if turtle is carrying egg
@@ -58,5 +61,4 @@ public interface Turtle extends Animals {
      * @param hasEgg True if carrying egg
      */
     void setHasEgg(boolean hasEgg);
-    // Paper end
 }
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch
index 15e9dfa1d..f1b0523e9 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch
@@ -100,10 +100,11 @@
              } else if (!isBrewable || !itemStack1.is(blockEntity.ingredient)) {
                  blockEntity.brewTime = 0;
              }
-@@ -114,6 +_,14 @@
+@@ -113,7 +_,14 @@
+             setChanged(level, pos, state);
          } else if (isBrewable && blockEntity.fuel > 0) {
              blockEntity.fuel--;
-             blockEntity.brewTime = 400;
+-            blockEntity.brewTime = 400;
 +            // CraftBukkit start
 +            org.bukkit.event.block.BrewingStartEvent event = new org.bukkit.event.block.BrewingStartEvent(
 +                org.bukkit.craftbukkit.block.CraftBlock.at(level, pos),
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
index d44e6f4bb..00e59cdc8 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
@@ -29,7 +29,6 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
         return this.getHandle().isLayingEgg();
     }
 
-    // Paper start
     @Override
     public org.bukkit.Location getHome() {
         return io.papermc.paper.util.MCUtil.toLocation(this.getHandle().level(), this.getHandle().getHomePos());
@@ -45,14 +44,8 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
         return this.getHandle().isGoingHome();
     }
 
-    @Override
-    public boolean isDigging() {
-        return this.getHandle().isLayingEgg();
-    }
-
     @Override
     public void setHasEgg(boolean hasEgg) {
         this.getHandle().setHasEgg(hasEgg);
     }
-    // Paper end
 }