8000 Make Sittable interface extend Entity (#12016) · PaperMC/Paper@53ae5c9 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 53ae5c9

Browse files
authored
Make Sittable interface extend Entity (#12016)
1 parent 597dcff commit 53ae5c9

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

paper-api/src/main/java/org/bukkit/entity/Panda.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -171,22 +171,6 @@ default void setIsSitting(boolean sitting) {
171171
this.setSitting(sitting);
172172
}
173173

174-
/**
175-
* Sets if this panda is currently sitting.
176-
*
177-
* @param sitting is currently sitting
178-
*/
179-
@Override
180-
void setSitting(boolean sitting);
181-
182-
/**
183-
* Gets if this panda is sitting.
184-
*
185-
* @return is sitting
186-
*/
187-
@Override
188-
boolean isSitting();
189-
190174
/**
191175
* Gets this Panda's combined gene.
192176
* <p>

paper-api/src/main/java/org/bukkit/entity/Sittable.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package org.bukkit.entity;
22

33
/**
4-
* An animal that can sit still.
4+
* An entity that can sit still.
55
*/
6-
public interface Sittable {
6+
public interface Sittable extends Entity {
77

88
/**
9-
* Checks if this animal is sitting
9+
* Checks if this entity is sitting
1010
*
1111
* @return true if sitting
1212
*/
1313
boolean isSitting();
1414

1515
/**
16-
* Sets if this animal is sitting. Will remove any path that the animal
16+
* Sets if this entity is sitting. Will remove any path that the entity
1717
* was following beforehand.
1818
*
1919
* @param sitting true if sitting

paper-server/src/test/java/org/bukkit/craftbukkit/entity/EntityTypesTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.bukkit.entity.PiglinAbstract;
5050
import org.bukkit.entity.Projectile;
5151
import org.bukkit.entity.Raider;
52+
import org.bukkit.entity.Sittable;
5253
import org.bukkit.entity.SizedFireball;
5354
import org.bukkit.entity.Spellcaster;
5455
import org.bukkit.entity.SplashPotion;
@@ -110,6 +111,7 @@ public class EntityTypesTest {
110111
PiglinAbstract.class,
111112
Projectile.class,
112113
Raider.class,
114+
Sittable.class,
113115
SizedFireball.class,
114116
Spellcaster.class,
115117
SplashPotion.class,

0 commit comments

Comments
 (0)
0