Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3110: SHULKER_BOX InventoryType

Browse Source
This commit is contained in:
md_5 2017-03-08 17:56:08 +11:00
parent 7a7c64714e
commit 4316a8c246
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@ -250,6 +250,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
openCustomInventory(inventory, player, "minecraft:anvil"); openCustomInventory(inventory, player, "minecraft:anvil");
} }
break; break;
case SHULKER_BOX:
if (iinventory instanceof TileEntityShulkerBox) {
getHandle().openTileEntity((TileEntityShulkerBox) iinventory);
} else {
openCustomInventory(inventory, player, "minecraft:shulker_box");
}
break;
case CREATIVE: case CREATIVE:
case CRAFTING: case CRAFTING:
throw new IllegalArgumentException("Can't open a " + type + " inventory!"); throw new IllegalArgumentException("Can't open a " + type + " inventory!");

3
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -15,6 +15,7 @@ import net.minecraft.server.TileEntityBrewingStand;
import net.minecraft.server.TileEntityDispenser; import net.minecraft.server.TileEntityDispenser;
import net.minecraft.server.TileEntityDropper; import net.minecraft.server.TileEntityDropper;
import net.minecraft.server.TileEntityFurnace; import net.minecraft.server.TileEntityFurnace;
import net.minecraft.server.TileEntityShulkerBox;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Location; import org.bukkit.Location;
@ -462,6 +463,8 @@ public class CraftInventory implements Inventory {
return InventoryType.ANVIL; return InventoryType.ANVIL;
} else if (inventory instanceof IHopper) { } else if (inventory instanceof IHopper) {
return InventoryType.HOPPER; return InventoryType.HOPPER;
} else if (inventory instanceof TileEntityShulkerBox) {
return InventoryType.SHULKER_BOX;
} else { } else {
return InventoryType.CHEST; return InventoryType.CHEST;
} }