Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fir merge error

Browse source
This commit is contained in:
Krapht 2013-03-28 16:44:03 +01:00
parent aecc8f0d3a
commit 6d93b645e2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/transport/TileGenericPipe.java
View file

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