Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-12 02:21:54 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3246: Use Sittable for Ocelot, Wolf and Parrot

Browse Source 
By: BlackHole <black-hole@live.com>
This commit is contained in:
Bukkit/Spigot 2017-05-15 23:29:02 +02:00
parent 331d059798
commit d3b7eee1f4
4 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
paper-api/src/main/java/org/bukkit/entity/Ocelot.java
View File

@ -4,7 +4,7 @@ package org.bukkit.entity;
/** /**
* A wild tameable cat * A wild tameable cat
*/ */
public interface Ocelot extends Animals, Tameable { public interface Ocelot extends Animals, Tameable, Sittable {
/** /**
* Gets the current type of this cat. * Gets the current type of this cat.
@ -20,21 +20,6 @@ public interface Ocelot extends Animals, Tameable {
*/ */
public void setCatType(Type type); public void setCatType(Type type);
/**
* Checks if this ocelot is sitting
*
* @return true if sitting
*/
public boolean isSitting();
/**
* Sets if this ocelot is sitting. Will remove any path that the ocelot
* was following beforehand.
*
* @param sitting true if sitting
*/
public void setSitting(boolean sitting);
/** /**
* Represents the various different cat types there are. * Represents the various different cat types there are.
*/ */

2
paper-api/src/main/java/org/bukkit/entity/Parrot.java
View File

@ -3,7 +3,7 @@ package org.bukkit.entity;
/** /**
* Represents a Parrot. * Represents a Parrot.
*/ */
public interface Parrot extends Animals, Tameable { public interface Parrot extends Animals, Tameable, Sittable {
/** /**
* Get the variant of this parrot. * Get the variant of this parrot.

23
paper-api/src/main/java/org/bukkit/entity/Sittable.java Normal file
View File

@ -0,0 +1,23 @@
package org.bukkit.entity;
/**
* An animal that can sit still.
*/
public interface Sittable {
/**
* Checks if this animal is sitting
*
* @return true if sitting
*/
boolean isSitting();
/**
* Sets if this animal is sitting. Will remove any path that the animal
* was following beforehand.
*
* @param sitting true if sitting
*/
void setSitting(boolean sitting);
}

18
paper-api/src/main/java/org/bukkit/entity/Wolf.java
View File

@ -5,7 +5,7 @@ import org.bukkit.DyeColor;
/** /**
* Represents a Wolf * Represents a Wolf
*/ */
public interface Wolf extends Animals, Tameable { public interface Wolf extends Animals, Tameable, Sittable {
/** /**
* Checks if this wolf is angry * Checks if this wolf is angry
@ -24,22 +24,6 @@ public interface Wolf extends Animals, Tameable {
*/ */
public void setAngry(boolean angry); public void setAngry(boolean angry);
/**
* Checks if this wolf is sitting
*
* @return true if sitting
*/
public boolean isSitting();
/**
* Sets if this wolf is sitting.
* <p>
* Will remove any path that the wolf was following beforehand.
*
* @param sitting true if sitting
*/
public void setSitting(boolean sitting);
/** /**
* Get the collar color of this wolf * Get the collar color of this wolf
* *