From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Sat, 22 Jun 2024 21:11:58 +0200 Subject: [PATCH] Leashable API diff --git a/src/main/java/io/papermc/paper/entity/Leashable.java b/src/main/java/io/papermc/paper/entity/Leashable.java new file mode 100644 index 0000000000000000000000000000000000000000..7e687535d1a622ddf25e3ece387dbfd5b7a49e83 --- /dev/null +++ b/src/main/java/io/papermc/paper/entity/Leashable.java @@ -0,0 +1,37 @@ +package io.papermc.paper.entity; + +import org.bukkit.entity.Entity; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; + +/** + * Represents an entity that can be leashed. + */ +@NullMarked +public interface Leashable extends Entity { + + /** + * Returns whether the entity is currently leashed. + * + * @return whether the entity is leashed + */ + boolean isLeashed(); + + /** + * Gets the entity that is currently leading this entity. + * + * @return the entity holding the leash + * @throws IllegalStateException if not currently leashed + */ + Entity getLeashHolder() throws IllegalStateException; + + /** + * Sets the leash on this entity to be held by the supplied entity. + *
+ * This method has no effect on players. + * + * @param holder the entity to leash this entity to, or {@code null} to unleash + * @return whether the operation was successful + */ + boolean setLeashHolder(@Nullable Entity holder); +} diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java index 219a2f06c57c8a64052c372a62892389a98f9ae1..aedfdf41d4fce01412498be9b896c09b2649d500 100644 --- a/src/main/java/org/bukkit/entity/Boat.java +++ b/src/main/java/org/bukkit/entity/Boat.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; /** * Represents a boat entity. */ -public interface Boat extends Vehicle { +public interface Boat extends Vehicle, io.papermc.paper.entity.Leashable { // Paper - Leashable API /** * Gets the wood type of the boat. diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java index 256e5645bcfa76e7ede58ae365e69b4a4bed6204..9a10262a952e330f42187d6e4edab5a225bfba62 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; /** * Represents a Mob. Mobs are living entities with simple AI. */ -public interface Mob extends LivingEntity, Lootable { +public interface Mob extends LivingEntity, Lootable, io.papermc.paper.entity.Leashable { // Paper - Leashable API // Paper start @Override