Manually merged riches' PR

This commit is contained in:
Aidan C. Brady committed 2014-06-04 11:05:29 +02:00
1 parent a973ef118c
commit d1c3b3b8ef
3 files changed
+21 -20

No files matched your search

@@ -1232,13 +1232,13 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
}
@Override
public IPeripheral getPeripheral(World world, int x, int y, int z, int side) {
public IPeripheral getPeripheral(World world, int x, int y, int z, int side)
{
TileEntity te = world.getTileEntity(x, y, z);
if(te != null && te instanceof IPeripheral)
{
return (IPeripheral) te;
return (IPeripheral)te;
}
return null;