mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
84 lines
3.1 KiB
Diff
84 lines
3.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||
|
--- /dev/null
|
||
|
+++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java
|
||
|
@@ -0,0 +0,0 @@
|
||
|
+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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
--- a/src/main/java/org/bukkit/inventory/HorseInventory.java
|
||
|
+++ b/src/main/java/org/bukkit/inventory/HorseInventory.java
|
||
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||
|
--- /dev/null
|
||
|
+++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
|
||
|
@@ -0,0 +0,0 @@
|
||
|
+package org.bukkit.inventory;
|
||
|
+
|
||
|
+public interface SaddledHorseInventory extends AbstractHorseInventory {}
|