Merge pull request #1625 from jstockwin/development

Fixed some Electric Chest bugs
This commit is contained in:
Aidan 2014-08-05 16:52:28 -04:00
commit 92cfc31223
2 changed files with 2 additions and 1 deletions

View file

@ -722,7 +722,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
{
TileEntityElectricChest electricChest = (TileEntityElectricChest)tileEntity;
if(!entityplayer.isSneaking())
if(!(entityplayer.isSneaking() || world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN)))
{
if(electricChest.canAccess())
{

View file

@ -102,6 +102,7 @@ public class PacketElectricChest implements IMessageHandler<ElectricChestMessage
{
TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj);
tileEntity.locked = message.locked;
player.worldObj.notifyBlocksOfNeighborChange(message.coord4D.xCoord,message.coord4D.yCoord,message.coord4D.zCoord,Mekanism.MachineBlock);
}
else {
ItemStack stack = player.getCurrentEquippedItem();