mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 02:25:28 +01:00
75 lines
2.7 KiB
Diff
75 lines
2.7 KiB
Diff
|
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..7402bab20db0ebcac5b2d492ad002ecf9669caad
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/src/main/java/io/papermc/paper/entity/Leashable.java
|
||
|
|
@@ -0,0 +1,36 @@
|
||
|
|
+package io.papermc.paper.entity;
|
||
|
|
+
|
||
|
|
+import org.bukkit.entity.Entity;
|
||
|
|
+import org.checkerframework.checker.nullness.qual.NonNull;
|
||
|
|
+import org.checkerframework.checker.nullness.qual.Nullable;
|
||
|
|
+
|
||
|
|
+/**
|
||
|
|
+ * Represents an entity that can be leashed.
|
||
|
|
+ */
|
||
|
|
+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
|
||
|
|
+ */
|
||
|
|
+ @NonNull Entity getLeashHolder() throws IllegalStateException;
|
||
|
|
+
|
||
|
|
+ /**
|
||
|
|
+ * Sets the leash on this entity to be held by the supplied entity.
|
||
|
|
+ * <p>
|
||
|
|
+ * 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 2ac685fb1817f3ce06ebe6391cc863712d68367c..d80524fe32672a8b8940d1028abf22026dace8d2 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
|