diff options
author | md_5 <git@md-5.net> | 2017-03-08 17:56:08 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-03-08 17:56:08 +1100 |
commit | 4316a8c246428aa7cf154198efe18d2252971651 (patch) | |
tree | 2593a467de79cf98e8f0e26c0bc58a4558d497a4 /src/main/java | |
parent | 7a7c64714ece2614f4f50805193aeead2ba18c23 (diff) | |
download | craftbukkit-4316a8c246428aa7cf154198efe18d2252971651.tar craftbukkit-4316a8c246428aa7cf154198efe18d2252971651.tar.gz craftbukkit-4316a8c246428aa7cf154198efe18d2252971651.tar.lz craftbukkit-4316a8c246428aa7cf154198efe18d2252971651.tar.xz craftbukkit-4316a8c246428aa7cf154198efe18d2252971651.zip |
SPIGOT-3110: SHULKER_BOX InventoryType
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java | 7 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index 581a4394..0397756c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -250,6 +250,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { openCustomInventory(inventory, player, "minecraft:anvil"); } break; + case SHULKER_BOX: + if (iinventory instanceof TileEntityShulkerBox) { + getHandle().openTileEntity((TileEntityShulkerBox) iinventory); + } else { + openCustomInventory(inventory, player, "minecraft:shulker_box"); + } + break; case CREATIVE: case CRAFTING: throw new IllegalArgumentException("Can't open a " + type + " inventory!"); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 0033246b..89e47bb3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -15,6 +15,7 @@ import net.minecraft.server.TileEntityBrewingStand; import net.minecraft.server.TileEntityDispenser; import net.minecraft.server.TileEntityDropper; import net.minecraft.server.TileEntityFurnace; +import net.minecraft.server.TileEntityShulkerBox; import org.apache.commons.lang.Validate; import org.bukkit.Location; @@ -462,6 +463,8 @@ public class CraftInventory implements Inventory { return InventoryType.ANVIL; } else if (inventory instanceof IHopper) { return InventoryType.HOPPER; + } else if (inventory instanceof TileEntityShulkerBox) { + return InventoryType.SHULKER_BOX; } else { return InventoryType.CHEST; } |