Merge pull request #1061 from tommy1019/patch-2

Obsidian pipes can't pick up arrows players can't.
This commit is contained in:
CovertJaguar 2013-07-27 18:51:40 -07:00
commit 1d40cb2d2f

View file

@ -279,9 +279,13 @@ public class PipeItemsObsidian extends Pipe<PipeTransportItems> implements IPowe
} }
return powerHandler.useEnergy(1, distance, false) >= distance; return powerHandler.useEnergy(1, distance, false) >= distance;
} else if (entity instanceof EntityArrow) } else if (entity instanceof EntityArrow) {
return powerHandler.useEnergy(1, distance, false) >= distance; EntityArrow arrow = (EntityArrow) entity;
else if (arrow.canBePickedUp == 1)
return powerHandler.useEnergy(1, distance, false) >= distance;
else
return false;
} else
return false; return false;
} }