Updated Upstream (Bukkit/CraftBukkit) (#7776)
This commit is contained in:
parent
608482d512
commit
4166632333
33 changed files with 144 additions and 132 deletions
|
@ -562,10 +562,41 @@ index 28cdb3b544572ba7aeb9061e3163e3895ac7d4e6..c8015ff610e3c1222cb368ea1d8a0c2f
|
|||
+}
|
||||
+// Paper end
|
||||
diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
|
||||
index c34a3ea7b4d16817b4bee25d5c69787e22ec44d8..6a39042f1ea18b4849c4b6d2343938e0f430aefb 100644
|
||||
index 627e3c1a96ae3331f5aa2dd7803dd2a31c7204be..3c447d2300c866ae605eeca97bd869f400d6be6f 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Vex.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Vex.java
|
||||
@@ -40,5 +40,37 @@ public interface Vex extends Monster {
|
||||
@@ -57,21 +57,30 @@ public interface Vex extends Monster {
|
||||
* Gets the remaining lifespan of this entity.
|
||||
*
|
||||
* @return life in ticks
|
||||
+ * @deprecated This API duplicates existing API which uses the more
|
||||
+ * preferable name due to mirroring internals better
|
||||
*/
|
||||
+ @Deprecated
|
||||
int getLifeTicks();
|
||||
|
||||
/**
|
||||
* Sets the remaining lifespan of this entity.
|
||||
*
|
||||
* @param lifeTicks life in ticks, or negative for unlimited lifepan
|
||||
+ * @deprecated This API duplicates existing API which uses the more
|
||||
+ * preferable name due to mirroring internals better
|
||||
*/
|
||||
+ @Deprecated
|
||||
void setLifeTicks(int lifeTicks);
|
||||
|
||||
/**
|
||||
* Gets if the entity has a limited life.
|
||||
*
|
||||
* @return true if the entity has limited life
|
||||
+ * @deprecated This API duplicates existing API which uses the more
|
||||
+ * preferable name due to mirroring internals better
|
||||
*/
|
||||
+ @Deprecated
|
||||
boolean hasLimitedLife();
|
||||
// Paper start
|
||||
|
||||
@@ -89,5 +98,37 @@ public interface Vex extends Monster {
|
||||
* @param summoner New summoner
|
||||
*/
|
||||
void setSummoner(@Nullable Mob summoner);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue