From 7071ea8e4e6c19e56e68a1f4a3559ecf5249b9d4 Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Sun, 28 Jan 2018 09:55:09 +1100
Subject: [PATCH] SPIGOT-2911: Implement AbstractHorseInventory

By: md_5 <git@md-5.net>
---
 .../java/org/bukkit/entity/AbstractHorse.java |  4 ++++
 .../inventory/AbstractHorseInventory.java     | 23 +++++++++++++++++++
 .../org/bukkit/inventory/HorseInventory.java  | 16 +------------
 .../org/bukkit/inventory/LlamaInventory.java  |  2 +-
 4 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 paper-api/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java

diff --git a/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java b/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
index 0e61571150..1075745469 100644
--- a/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
@@ -1,5 +1,6 @@
 package org.bukkit.entity;
 
+import org.bukkit.inventory.AbstractHorseInventory;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
@@ -96,4 +97,7 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
      * @param strength jump strength for this horse
      */
     public void setJumpStrength(double strength);
+
+    @Override
+    public AbstractHorseInventory getInventory();
 }
diff --git a/paper-api/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java b/paper-api/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java
new file mode 100644
index 0000000000..4c16e34aa6
--- /dev/null
+++ b/paper-api/src/main/java/org/bukkit/inventory/AbstractHorseInventory.java
@@ -0,0 +1,23 @@
+package org.bukkit.inventory;
+
+import org.bukkit.entity.AbstractHorse;
+
+/**
+ * An interface to the inventory of an {@link AbstractHorse}.
+ */
+public interface AbstractHorseInventory extends Inventory {
+
+    /**
+     * 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);
+}
diff --git a/paper-api/src/main/java/org/bukkit/inventory/HorseInventory.java b/paper-api/src/main/java/org/bukkit/inventory/HorseInventory.java
index a71efb8358..a73c985020 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/HorseInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/HorseInventory.java
@@ -3,14 +3,7 @@ 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.
@@ -19,13 +12,6 @@ public interface HorseInventory extends Inventory {
      */
     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.
      *
diff --git a/paper-api/src/main/java/org/bukkit/inventory/LlamaInventory.java b/paper-api/src/main/java/org/bukkit/inventory/LlamaInventory.java
index 406fb18fde..9b3dcf3faa 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/LlamaInventory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/LlamaInventory.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Llama;
 /**
  * An interface to the inventory of a {@link Llama}.
  */
-public interface LlamaInventory extends Inventory {
+public interface LlamaInventory extends AbstractHorseInventory {
 
     /*
      * Gets the item in the llama's decor slot.