diff options
Diffstat (limited to 'patches/api/0062-Improve-the-Saddle-API-for-Horses.patch')
| -rw-r--r-- | patches/api/0062-Improve-the-Saddle-API-for-Horses.patch | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch index 85814456bf..033f539a9b 100644 --- a/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch +++ b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch @@ -8,14 +8,16 @@ and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java new file mode 100644 -index 0000000000000000000000000000000000000000..163ffe8ff76ded6265d865901d5110fb6a56950d +index 0000000000000000000000000000000000000000..994f34ac2062c092c2b4e5ff364067482d19588c --- /dev/null +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java -@@ -0,0 +1,21 @@ +@@ -0,0 +1,22 @@ +package org.bukkit.inventory; + -+import org.jetbrains.annotations.Nullable; ++import org.jspecify.annotations.NullMarked; ++import org.jspecify.annotations.Nullable; + ++@NullMarked +public interface ArmoredHorseInventory extends AbstractHorseInventory { + + /** @@ -23,8 +25,7 @@ index 0000000000000000000000000000000000000000..163ffe8ff76ded6265d865901d5110fb + * + * @return the armor item + */ -+ @Nullable -+ ItemStack getArmor(); ++ @Nullable ItemStack getArmor(); + + /** + * Sets the item in the horse's armor slot. @@ -74,10 +75,14 @@ index 2fa2c9d07ecbafaf2396d913af90f1f4d432b238..5ac1afb8a213fa0fe344db4730ecbc5d * Gets the item in the llama's decor slot. diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java new file mode 100644 -index 0000000000000000000000000000000000000000..7944f26a3e2a92601c3be0e55c00c39cc16cf177 +index 0000000000000000000000000000000000000000..0f508a8df87f1e23764152d00e02a3da5131f034 --- /dev/null +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java -@@ -0,0 +1,3 @@ +@@ -0,0 +1,7 @@ +package org.bukkit.inventory; + -+public interface SaddledHorseInventory extends AbstractHorseInventory {} ++import org.jspecify.annotations.NullMarked; ++ ++@NullMarked ++public interface SaddledHorseInventory extends AbstractHorseInventory { ++} |