Fir merge error

This commit is contained in:
Krapht 2013-03-28 16:44:03 +01:00
parent aecc8f0d3a
commit 6d93b645e2

View file

@ -408,7 +408,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank
@Override
public int powerRequest(ForgeDirection from) {
if (BlockGenericPipe.isValid(pipe) && pipe instanceof IPowerReceptor)
return ((IPowerReceptor) pipe).powerRequest();
return ((IPowerReceptor) pipe).powerRequest(from);
return 0;
}