Merge branch 'mc16' of https://github.com/BuildCraft/BuildCraft into mc16
This commit is contained in:
commit
87624d9572
1 changed files with 7 additions and 3 deletions
|
@ -279,9 +279,13 @@ public class PipeItemsObsidian extends Pipe<PipeTransportItems> implements IPowe
|
|||
}
|
||||
|
||||
return powerHandler.useEnergy(1, distance, false) >= distance;
|
||||
} else if (entity instanceof EntityArrow)
|
||||
return powerHandler.useEnergy(1, distance, false) >= distance;
|
||||
else
|
||||
} else if (entity instanceof EntityArrow) {
|
||||
EntityArrow arrow = (EntityArrow) entity;
|
||||
if (arrow.canBePickedUp == 1)
|
||||
return powerHandler.useEnergy(1, distance, false) >= distance;
|
||||
else
|
||||
return false;
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue