diff --git a/Spigot-Server-Patches/0201-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0202-ShulkerBox-Dupe-Prevention.patch similarity index 93% rename from Spigot-Server-Patches/0201-ShulkerBox-Dupe-Prevention.patch rename to Spigot-Server-Patches/0202-ShulkerBox-Dupe-Prevention.patch index b8ccdaaad0..b2b49b1dbf 100644 --- a/Spigot-Server-Patches/0201-ShulkerBox-Dupe-Prevention.patch +++ b/Spigot-Server-Patches/0202-ShulkerBox-Dupe-Prevention.patch @@ -1,4 +1,4 @@ -From d820d766f014a27f41905e911a148ac7024befaa Mon Sep 17 00:00:00 2001 +From f95c6604570bf2aae757ad0509dc91a3c8bf30f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 16:32:56 -0500 Subject: [PATCH] ShulkerBox Dupe Prevention diff --git a/Spigot-Server-Patches/0203-Use-correct-Horse-Inventory.patch b/Spigot-Server-Patches/0203-Use-correct-Horse-Inventory.patch new file mode 100644 index 0000000000..0cf282eea1 --- /dev/null +++ b/Spigot-Server-Patches/0203-Use-correct-Horse-Inventory.patch @@ -0,0 +1,22 @@ +From 09063ac1369f3d65a2f8d06964388ebb37afe991 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 4 Jan 2017 21:19:42 -0500 +Subject: [PATCH] Use correct Horse Inventory + + +diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java +index 645f3e5b1..88e148991 100644 +--- a/src/main/java/net/minecraft/server/ContainerHorse.java ++++ b/src/main/java/net/minecraft/server/ContainerHorse.java +@@ -21,7 +21,7 @@ public class ContainerHorse extends Container { + return bukkitEntity; + } + +- CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryHorse(this.a); ++ org.bukkit.inventory.Inventory inventory = ((org.bukkit.inventory.InventoryHolder) this.f.getBukkitEntity()).getInventory(); // Paper + return bukkitEntity = new CraftInventoryView(player.player.getBukkitEntity(), inventory, this); + } + +-- +2.11.0 +