Update B/CB

Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 9597a9d8..478f2c3c 100644
+index 19632d17..de1b1112 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -0,0 +0,0 @@ public final class NamespacedKey {
@@ -73,7 +73,7 @@ index 8d29dcbd..0bc47dd6 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
-index 0e615711..e912299b 100644
+index 10757454..6d5410ea 100644
 --- a/src/main/java/org/bukkit/entity/AbstractHorse.java
 +++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
 @@ -0,0 +0,0 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
@@ -335,7 +335,7 @@ index 60470b88..76313d4d 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 170ae21a..c0de37a7 100644
+index 92174e81..ac5cc32c 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -0,0 +0,0 @@ public interface Team {

Spigot-API-Patches/Improve-the-Saddle-API-for-Horses.patch

@@ -8,13 +8,13 @@ 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 00000000..037479de
+index 00000000..a39b9544
 --- /dev/null
 +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
 @@ -0,0 +0,0 @@
 +package org.bukkit.inventory;
 +
-+public interface ArmoredHorseInventory extends Inventory {
++public interface ArmoredHorseInventory extends AbstractHorseInventory {
 +
 +    /**
 +     * Gets the item in the horse's armor slot.
@@ -31,21 +31,14 @@ index 00000000..037479de
 +    void setArmor(ItemStack stack);
 +}
 diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java
-index a71efb83..b4b95ab5 100644
+index a73c9850..e14c1277 100644
 --- a/src/main/java/org/bukkit/inventory/HorseInventory.java
 +++ b/src/main/java/org/bukkit/inventory/HorseInventory.java
 @@ -0,0 +0,0 @@ package org.bukkit.inventory;
  /**
   * An interface to the inventory of a Horse.
   */
--public interface HorseInventory extends Inventory {
--
--    /**
--     * Gets the item in the horse's saddle slot.
--     *
--     * @return the saddle item
--     */
--    ItemStack getSaddle();
+-public interface HorseInventory extends AbstractHorseInventory {
 -
 -    /**
 -     * Gets the item in the horse's armor slot.
@@ -55,42 +48,33 @@ index a71efb83..b4b95ab5 100644
 -    ItemStack getArmor();
 -
 -    /**
--     * Sets the item in the horse's saddle slot.
--     *
--     * @param stack the new item
--     */
--    void setSaddle(ItemStack stack);
--
--    /**
 -     * Sets the item in the horse's armor slot.
 -     *
 -     * @param stack the new item
 -     */
 -    void setArmor(ItemStack stack);
 -}
-+public interface HorseInventory extends ArmoredHorseInventory, SaddledHorseInventory {}
++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 9b3dcf3f..7856a7f2 100644
+--- a/src/main/java/org/bukkit/inventory/LlamaInventory.java
++++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java
+@@ -0,0 +0,0 @@ import org.bukkit.entity.Llama;
+ /**
+  * 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 00000000..010dc364
+index 00000000..7944f26a
 --- /dev/null
 +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
 @@ -0,0 +0,0 @@
 +package org.bukkit.inventory;
 +
-+public interface SaddledHorseInventory {
-+
-+    /**
-+     * Gets the item in the horse's saddle slot.
-+     *
-+     * @return the saddle item
-+     */
-+    ItemStack getSaddle();
-+
-+    /**
-+     * Sets the item in the horse's saddle slot.
-+     *
-+     * @param stack the new item
-+     */
-+    void setSaddle(ItemStack stack);
-+}
++public interface SaddledHorseInventory extends AbstractHorseInventory {}
 --