SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update B/CB

Browse Source
This commit is contained in:
Shane Freeder
2018-02-08 10:07:27 +00:00
parent 963ddeb6ed
commit 26144e31b3
5 changed files with 35 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {}
--