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

fix #1599

Browse source
This commit is contained in:
asiekierka 2014-10-22 17:47:08 +02:00
parent 3c24d1ecf4
commit 95c85ae535
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
common/buildcraft/transport/pipes/PipeItemsStripes.java
View file

@ -106,10 +106,41 @@ public class PipeItemsStripes extends Pipe<PipeTransportItems> implements IEnerg
*/
if (convertPipe(transport, event.item)) {
int moves = 0;
while (stack.stackSize > 0) {
if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) != Blocks.air) {
break;
}
stack.getItem().onItemUse(new ItemStack(stack.getItem(), 1, stack.getItemDamage()),
player, getWorld(), (int) p.x, (int) p.y, (int) p.z, 1, 0, 0, 0
);
stack.stackSize--;
p.moveForwards(1.0);
moves++;
}
if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) != Blocks.air) {
p.moveBackwards(1.0);
stack.stackSize++;
getWorld().setBlockToAir((int) p.x, (int) p.y, (int) p.z);
}
BuildCraftTransport.pipeItemsStripes.onItemUse(new ItemStack(
BuildCraftTransport.pipeItemsStripes), player, getWorld(), (int) p.x,
BuildCraftTransport.pipeItemsStripes), player, getWorld(), (int) p.x,
(int) p.y, (int) p.z, 1, 0, 0, 0
);
);
if (stack.stackSize > 0) {
TileEntity targetTile = getWorld().getTileEntity((int) p.x, (int) p.y, (int) p.z);
if (targetTile instanceof TileGenericPipe) {
TravelingItem newItem = TravelingItem.make(
container.xCoord + 0.5,
container.yCoord + TransportUtils.getPipeFloorOf(
new ItemStack(BuildCraftTransport.pipeItemsStripes)),
container.zCoord + 0.5, stack.copy());
((PipeTransportItems) ((TileGenericPipe) targetTile).pipe.transport).injectItem(newItem, event.direction.getOpposite());
stack.stackSize = 0;
}
}
} else if (stack.getItem() instanceof ItemBlock) {
if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) == Blocks.air) {
stack.tryPlaceItemIntoWorld(

8
common/buildcraft/transport/stripes/StripesHandlerBucket.java
View file

@ -26,13 +26,7 @@ public class StripesHandlerBucket implements IStripesHandler {
@Override
public boolean shouldHandle(ItemStack stack) {
if (stack.getItem() instanceof ItemBucket) {
return true;
}
ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(stack);
return emptyContainer != null && emptyContainer.getItem() instanceof ItemBucket;
return stack.getItem() instanceof ItemBucket;
}
@Override