diff options
| author | Spottedleaf <[email protected]> | 2024-10-25 12:47:52 -0700 |
|---|---|---|
| committer | Spottedleaf <[email protected]> | 2024-10-25 13:05:26 -0700 |
| commit | e4efb590e49d30c9abe606838572aa5b4e9b5572 (patch) | |
| tree | 9b60f27fd5f94daa2ea0a24edef90eb52c5811ea /patches/api/0481-Leashable-API.patch | |
| parent | 2e76d3f1e200c567e62337e0d50ddcb01e3ea895 (diff) | |
| download | Paper-e4efb590e49d30c9abe606838572aa5b4e9b5572.tar.gz Paper-e4efb590e49d30c9abe606838572aa5b4e9b5572.zip | |
fix compile issues
Diffstat (limited to 'patches/api/0481-Leashable-API.patch')
| -rw-r--r-- | patches/api/0481-Leashable-API.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/patches/api/0481-Leashable-API.patch b/patches/api/0481-Leashable-API.patch new file mode 100644 index 0000000000..b84951d969 --- /dev/null +++ b/patches/api/0481-Leashable-API.patch @@ -0,0 +1,75 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <[email protected]> +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. ++ * <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 7076870c1abfa0edef33e00c39514aa413920f59..574574dc4f54a4ce32e7c97f2fbeb92a4991d353 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 |