core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-2989: Use correct Horse Inventory

This commit is contained in:
Aikar 2017-01-04 21:23:16 -05:00
parent 9b9a43e472
commit 849653ebac
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/0201-ShulkerBox-Dupe-Prevention.patch → Spigot-Server-Patches/0202-ShulkerBox-Dupe-Prevention.patch
View File

@ -1,4 +1,4 @@
From d820d766f014a27f41905e911a148ac7024befaa Mon Sep 17 00:00:00 2001
From f95c6604570bf2aae757ad0509dc91a3c8bf30f1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 2 Jan 2017 16:32:56 -0500
Subject: [PATCH] ShulkerBox Dupe Prevention

22
Spigot-Server-Patches/0203-Use-correct-Horse-Inventory.patch Normal file
View File

@ -0,0 +1,22 @@
From 09063ac1369f3d65a2f8d06964388ebb37afe991 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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