Merge remote-tracking branch 'remotes/origin/master' into 1.7.10
This commit is contained in:
commit
b7023f3114
2 changed files with 2 additions and 2 deletions
|
@ -319,7 +319,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
|
||||||
Block block = world.getBlock(x, y, z);
|
Block block = world.getBlock(x, y, z);
|
||||||
|
|
||||||
|
|
||||||
if (block.getUnlocalizedName().equals("tile.air")) {
|
if (block.isAir(world, x, y, z)) {
|
||||||
|
|
||||||
} else if (block.getUnlocalizedName().equals("tile.lava")) {
|
} else if (block.getUnlocalizedName().equals("tile.lava")) {
|
||||||
hasLava = true;
|
hasLava = true;
|
||||||
|
|
|
@ -208,7 +208,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) {
|
public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) {
|
||||||
if (slotIndex >= 1)
|
if (slotIndex >= 2)
|
||||||
return false;
|
return false;
|
||||||
return isItemValidForSlot(slotIndex, itemStack);
|
return isItemValidForSlot(slotIndex, itemStack);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue