Update Upstream

This commit is contained in:
Aikar
2016-11-18 23:58:56 -05:00
parent 8f3325047c
commit 7d73fa7ae0
5 changed files with 20 additions and 17 deletions

View File

@@ -667,8 +667,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
import org.bukkit.inventory.Inventory;
-public class CraftChest extends CraftContainer implements Chest {
+public class CraftChest extends CraftContainer implements Chest, CraftLootableBlockInventory { // Paper
-public class CraftChest extends CraftLootable implements Chest {
+public class CraftChest extends CraftLootable implements Chest, CraftLootableBlockInventory { // Paper
private final CraftWorld world;
private final TileEntityChest chest;
@@ -687,8 +687,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
import org.bukkit.inventory.Inventory;
import org.bukkit.projectiles.BlockProjectileSource;
-public class CraftDispenser extends CraftContainer implements Dispenser {
+public class CraftDispenser extends CraftContainer implements Dispenser, CraftLootableBlockInventory { // Paper
-public class CraftDispenser extends CraftLootable implements Dispenser {
+public class CraftDispenser extends CraftLootable implements Dispenser, CraftLootableBlockInventory { // Paper
private final CraftWorld world;
private final TileEntityDispenser dispenser;
@@ -707,8 +707,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
-public class CraftHopper extends CraftContainer implements Hopper {
+public class CraftHopper extends CraftContainer implements Hopper, CraftLootableBlockInventory { // Paper
-public class CraftHopper extends CraftLootable implements Hopper {
+public class CraftHopper extends CraftLootable implements Hopper, CraftLootableBlockInventory { // Paper
private final TileEntityHopper hopper;
public CraftHopper(final Block block) {