Fix Laser Relay interaction >_<

This commit is contained in:
Ellpeck 2017-02-13 19:41:54 +01:00
parent e8d89f6df4
commit 9b21323c4f

View file

@ -164,7 +164,10 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{
TileEntityLaserRelay relay = (TileEntityLaserRelay)tile; TileEntityLaserRelay relay = (TileEntityLaserRelay)tile;
if(StackUtil.isValid(stack)){ if(StackUtil.isValid(stack)){
if(stack.getItem() instanceof ItemCompass){ if(stack.getItem() instanceof ItemLaserWrench){
return false;
}
else if(stack.getItem() instanceof ItemCompass){
if(!world.isRemote){ if(!world.isRemote){
relay.onCompassAction(player); relay.onCompassAction(player);
@ -183,7 +186,9 @@ public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay{
ItemStack inRelay = relay.slots.getStackInSlot(0); ItemStack inRelay = relay.slots.getStackInSlot(0);
if(!StackUtil.isValid(inRelay)){ if(!StackUtil.isValid(inRelay)){
if(!world.isRemote){ if(!world.isRemote){
if(!player.isCreative()){
player.setHeldItem(hand, StackUtil.addStackSize(stack, -1)); player.setHeldItem(hand, StackUtil.addStackSize(stack, -1));
}
ItemStack set = StackUtil.validateCopy(stack); ItemStack set = StackUtil.validateCopy(stack);
relay.slots.setStackInSlot(0, StackUtil.setStackSize(set, 1)); relay.slots.setStackInSlot(0, StackUtil.setStackSize(set, 1));