diff options
| author | Kobe ⑧ <[email protected]> | 2024-12-08 14:05:17 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-08 17:05:17 -0500 |
| commit | 15b2aa1d30a24f07671671cf82fe09fdce1f3b03 (patch) | |
| tree | 9e4076b8113c64dc5ff74ccd9c3792a7e20a4b76 /patches/api/0389-Add-Shearable-API.patch | |
| parent | 07ef2bbab97ec883bdad515ba4db1bff65dfcc81 (diff) | |
| download | Paper-15b2aa1d30a24f07671671cf82fe09fdce1f3b03.tar.gz Paper-15b2aa1d30a24f07671671cf82fe09fdce1f3b03.zip | |
Readd shear methods from bukkit Shearable (#11715)
* Re-add shear methods from bukkit Shearable
* Add back
Diffstat (limited to 'patches/api/0389-Add-Shearable-API.patch')
| -rw-r--r-- | patches/api/0389-Add-Shearable-API.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/patches/api/0389-Add-Shearable-API.patch b/patches/api/0389-Add-Shearable-API.patch index 8dd853b0fb..29875e12d9 100644 --- a/patches/api/0389-Add-Shearable-API.patch +++ b/patches/api/0389-Add-Shearable-API.patch @@ -55,16 +55,18 @@ index 0000000000000000000000000000000000000000..3991f2aa530c588f52e1f596d3b03743 + boolean readyToBeSheared(); +} diff --git a/src/main/java/org/bukkit/entity/Bogged.java b/src/main/java/org/bukkit/entity/Bogged.java -index 8b75a505a55a96a5795ac31a2d37307add12cd9e..6296a6f3f3e794677fd3a626376f357c740ec356 100644 +index 0e5aaf54df0a5d0995147a905daef52442b070c5..6093b1dad8ad48708267a83bf4c1ad20467b3cf9 100644 --- a/src/main/java/org/bukkit/entity/Bogged.java +++ b/src/main/java/org/bukkit/entity/Bogged.java -@@ -6,5 +6,5 @@ import org.jetbrains.annotations.ApiStatus; +@@ -6,7 +6,7 @@ import org.jetbrains.annotations.ApiStatus; * Represents a Bogged Skeleton. */ @ApiStatus.Experimental -public interface Bogged extends AbstractSkeleton, Shearable { +public interface Bogged extends AbstractSkeleton, Shearable, io.papermc.paper.entity.Shearable { // Paper - Shear API - } + + /** + * Gets whether the bogged is in its sheared state. diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java index cef1700834643fe28ed5737578d91ecefbe99e2f..86c0043ef4e1288b6fe2f68a9b6d01c3de2c3454 100644 --- a/src/main/java/org/bukkit/entity/MushroomCow.java @@ -114,16 +116,18 @@ index 0215d20f81bfbef080f86ce46147a38f71310f65..9967c8a52ddd2c7e10db49a3f1667313 void setSheared(boolean flag); } diff --git a/src/main/java/org/bukkit/entity/Sheep.java b/src/main/java/org/bukkit/entity/Sheep.java -index 46bc1a0ed9ee320c68a38362c1fa1f31319f01d8..01a0e5b1bb18d7a28d68329c2e2ab78a8df45f8e 100644 +index 9ed473e5e993ef2d9558fe18bbcea7dad9b42994..f67f478945a7ba99bf72601678a153553526799a 100644 --- a/src/main/java/org/bukkit/entity/Sheep.java +++ b/src/main/java/org/bukkit/entity/Sheep.java -@@ -5,5 +5,5 @@ import org.bukkit.material.Colorable; +@@ -5,7 +5,7 @@ import org.bukkit.material.Colorable; /** * Represents a Sheep. */ -public interface Sheep extends Animals, Colorable, Shearable { +public interface Sheep extends Animals, Colorable, Shearable, io.papermc.paper.entity.Shearable { // Paper - Shear API - } + + /** + * Gets whether the sheep is in its sheared state. diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java index 10f8f6d45ae9280651c3ebddd1f90acbd7d6ff29..7fbfdb07585c7b28acea1f0c1f58ada0cc744441 100644 --- a/src/main/java/org/bukkit/entity/Snowman.java |