mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
86 lines
2.9 KiB
Diff
86 lines
2.9 KiB
Diff
From 01ff2f70c2ef6bafe4b99eb940d63bb256526819 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 10 Dec 2016 16:12:48 -0500
|
|
Subject: [PATCH] Improve the Saddle API for Horses
|
|
|
|
Not all horses with Saddles have armor. This lets us break up the horses with saddles
|
|
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 000000000..163ffe8ff
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
|
|
@@ -0,0 +1,21 @@
|
|
+package org.bukkit.inventory;
|
|
+
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+public interface ArmoredHorseInventory extends AbstractHorseInventory {
|
|
+
|
|
+ /**
|
|
+ * Gets the item in the horse's armor slot.
|
|
+ *
|
|
+ * @return the armor item
|
|
+ */
|
|
+ @Nullable
|
|
+ ItemStack getArmor();
|
|
+
|
|
+ /**
|
|
+ * Sets the item in the horse's armor slot.
|
|
+ *
|
|
+ * @param stack the new item
|
|
+ */
|
|
+ void setArmor(@Nullable ItemStack stack);
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java
|
|
index 608e99c42..53498debe 100644
|
|
--- a/src/main/java/org/bukkit/inventory/HorseInventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/HorseInventory.java
|
|
@@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* An interface to the inventory of a Horse.
|
|
*/
|
|
-public interface HorseInventory extends AbstractHorseInventory {
|
|
-
|
|
- /**
|
|
- * Gets the item in the horse's armor slot.
|
|
- *
|
|
- * @return the armor item
|
|
- */
|
|
- @Nullable
|
|
- ItemStack getArmor();
|
|
-
|
|
- /**
|
|
- * Sets the item in the horse's armor slot.
|
|
- *
|
|
- * @param stack the new item
|
|
- */
|
|
- void setArmor(@Nullable ItemStack stack);
|
|
-}
|
|
+public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {}
|
|
diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java
|
|
index 2fa2c9d07..5ac1afb8a 100644
|
|
--- a/src/main/java/org/bukkit/inventory/LlamaInventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java
|
|
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* An interface to the inventory of a {@link Llama}.
|
|
*/
|
|
-public interface LlamaInventory extends AbstractHorseInventory {
|
|
+public interface LlamaInventory extends SaddledHorseInventory {
|
|
|
|
/**
|
|
* 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 000000000..7944f26a3
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
|
|
@@ -0,0 +1,3 @@
|
|
+package org.bukkit.inventory;
|
|
+
|
|
+public interface SaddledHorseInventory extends AbstractHorseInventory {}
|
|
--
|
|
2.21.0
|
|
|