From 53ae5c95b71d6621bfd4b53c6792bb90652e1e9e Mon Sep 17 00:00:00 2001
From: David <54660361+NonSwag@users.noreply.github.com>
Date: Sat, 8 Feb 2025 20:16:23 +0100
Subject: [PATCH] Make Sittable interface extend Entity (#12016)

---
 .../src/main/java/org/bukkit/entity/Panda.java   | 16 ----------------
 .../main/java/org/bukkit/entity/Sittable.java    |  8 ++++----
 .../craftbukkit/entity/EntityTypesTest.java      |  2 ++
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/entity/Panda.java b/paper-api/src/main/java/org/bukkit/entity/Panda.java
index 4f06870cc8..cfe00e42f1 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Panda.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Panda.java
@@ -171,22 +171,6 @@ public interface Panda extends Animals, Sittable {
         this.setSitting(sitting);
     }
 
-    /**
-     * Sets if this panda is currently sitting.
-     *
-     * @param sitting is currently sitting
-     */
-    @Override
-    void setSitting(boolean sitting);
-
-    /**
-     * Gets if this panda is sitting.
-     *
-     * @return is sitting
-     */
-    @Override
-    boolean isSitting();
-
     /**
      * Gets this Panda's combined gene.
      * <p>
diff --git a/paper-api/src/main/java/org/bukkit/entity/Sittable.java b/paper-api/src/main/java/org/bukkit/entity/Sittable.java
index ea6ee26fc4..f873e94922 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Sittable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Sittable.java
@@ -1,19 +1,19 @@
 package org.bukkit.entity;
 
 /**
- * An animal that can sit still.
+ * An entity that can sit still.
  */
-public interface Sittable {
+public interface Sittable extends Entity {
 
     /**
-     * Checks if this animal is sitting
+     * Checks if this entity is sitting
      *
      * @return true if sitting
      */
     boolean isSitting();
 
     /**
-     * Sets if this animal is sitting. Will remove any path that the animal
+     * Sets if this entity is sitting. Will remove any path that the entity
      * was following beforehand.
      *
      * @param sitting true if sitting
diff --git a/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java b/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
index b638519bba..ff294e6fd3 100644
--- a/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
+++ b/paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java
@@ -49,6 +49,7 @@ import org.bukkit.entity.NPC;
 import org.bukkit.entity.PiglinAbstract;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Raider;
+import org.bukkit.entity.Sittable;
 import org.bukkit.entity.SizedFireball;
 import org.bukkit.entity.Spellcaster;
 import org.bukkit.entity.SplashPotion;
@@ -110,6 +111,7 @@ public class EntityTypesTest {
             PiglinAbstract.class,
             Projectile.class,
             Raider.class,
+            Sittable.class,
             SizedFireball.class,
             Spellcaster.class,
             SplashPotion.class,