tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed EM path going through lava

Browse source
This commit is contained in:
Calclavia 2013-08-14 10:42:33 +08:00
parent a52b4d39a3
commit 3022e5056d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/resonantinduction/contractor/TileEntityEMContractor.java
View file

@ -237,7 +237,7 @@ public class TileEntityEMContractor extends TileEntityAdvanced implements IPacke
public static boolean canBePath(World world, Vector3 position)
{
Block block = Block.blocksList[position.getBlockID(world)];
return block == null || (block instanceof BlockSnow || block instanceof BlockVine || block instanceof BlockLadder || block instanceof BlockFluid || block instanceof IFluidBlock);
return block == null || (block instanceof BlockSnow || block instanceof BlockVine || block instanceof BlockLadder || ((block instanceof BlockFluid || block instanceof IFluidBlock) && block.blockID != Block.lavaMoving.blockID && block.blockID != Block.lavaStill.blockID));
}
private void moveEntity(EntityItem entityItem, ForgeDirection direction, Vector3 lockVector)
@ -350,6 +350,7 @@ public class TileEntityEMContractor extends TileEntityAdvanced implements IPacke
entityItem.isAirBorne = true;
entityItem.delayBeforeCanPickup = 1;
entityItem.age = Math.max(entityItem.age - 1, 0);
}
private EntityItem getItemWithPosition(ItemStack toSend)

2
src/resonantinduction/wire/TileEntityTickWire.java
View file

@ -121,6 +121,8 @@ public class TileEntityTickWire extends TileEntityWire implements IElectrical
this.furnaces.put(direction, (TileEntityFurnace) tileEntity);
}
}
System.out.println("TEST " + this.furnaces.size());
}
}