2016-11-17 02:41:03 +01:00
|
|
|
--- a/net/minecraft/server/BlockShulkerBox.java
|
|
|
|
|
+++ b/net/minecraft/server/BlockShulkerBox.java
|
2016-11-18 01:24:41 +01:00
|
|
|
@@ -3,7 +3,7 @@
|
|
|
|
|
public class BlockShulkerBox extends BlockTileEntity {
|
|
|
|
|
|
|
|
|
|
public static final BlockStateEnum<EnumDirection> a = BlockStateDirection.of("facing");
|
|
|
|
|
- private final EnumColor b;
|
|
|
|
|
+ public final EnumColor b; // PAIL: public, rename
|
|
|
|
|
|
|
|
|
|
public BlockShulkerBox(EnumColor enumcolor) {
|
|
|
|
|
super(Material.STONE, MaterialMapColor.b);
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -89,7 +89,32 @@
|
|
|
|
|
tileentityshulkerbox.d(entityhuman);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- public void dropNaturally(World world, BlockPosition blockposition, IBlockData iblockdata, float f, int i) {}
|
|
|
|
|
+ // CraftBukkit start - override to prevent duplication when dropping
|
|
|
|
|
+ public void dropNaturally(World world, BlockPosition blockposition, IBlockData iblockdata, float f, int i) {
|
|
|
|
|
+ TileEntity tileentity = world.getTileEntity(blockposition);
|
|
|
|
|
+
|
|
|
|
|
+ if (tileentity instanceof TileEntityShulkerBox) {
|
|
|
|
|
+ TileEntityShulkerBox tileentityshulkerbox = (TileEntityShulkerBox) tileentity;
|
|
|
|
|
+
|
|
|
|
|
+ if (!tileentityshulkerbox.r() && tileentityshulkerbox.F()) {
|
|
|
|
|
+ ItemStack itemstack = new ItemStack(Item.getItemOf(this));
|
|
|
|
|
+ NBTTagCompound nbttagcompound = new NBTTagCompound();
|
|
|
|
|
+ NBTTagCompound nbttagcompound1 = new NBTTagCompound();
|
|
|
|
|
+
|
|
|
|
|
+ nbttagcompound.set("BlockEntityTag", ((TileEntityShulkerBox) tileentity).f(nbttagcompound1));
|
|
|
|
|
+ itemstack.setTag(nbttagcompound);
|
|
|
|
|
+ if (tileentityshulkerbox.hasCustomName()) {
|
|
|
|
|
+ itemstack.g(tileentityshulkerbox.getName());
|
|
|
|
|
+ tileentityshulkerbox.a("");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ a(world, blockposition, itemstack);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
public void postPlace(World world, BlockPosition blockposition, IBlockData iblockdata, EntityLiving entityliving, ItemStack itemstack) {
|
|
|
|
|
if (itemstack.hasName()) {
|
|
|
|
|
@@ -105,7 +130,7 @@
|
|
|
|
|
public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
|
|
|
|
TileEntity tileentity = world.getTileEntity(blockposition);
|
|
|
|
|
|
|
|
|
|
- if (tileentity instanceof TileEntityShulkerBox) {
|
|
|
|
|
+ if (false && tileentity instanceof TileEntityShulkerBox) { // CraftBukkit - moved up
|
|
|
|
|
TileEntityShulkerBox tileentityshulkerbox = (TileEntityShulkerBox) tileentity;
|
|
|
|
|
|
|
|
|
|
if (!tileentityshulkerbox.r() && tileentityshulkerbox.F()) {
|
