Merge branch 'mc1.5' of github.com:BuildCraft/BuildCraft into mc1.5
This commit is contained in:
commit
b0fb4b3d8f
2 changed files with 2 additions and 1 deletions
|
@ -73,6 +73,7 @@ public abstract class FillerPattern implements IFillerPattern {
|
|||
}
|
||||
|
||||
if (found && stackToPlace != null) {
|
||||
BlockUtil.breakBlock(world, xSlot, ySlot, zSlot);
|
||||
stackToPlace.getItem().onItemUse(stackToPlace, CoreProxy.proxy.getBuildCraftPlayer(world), world, xSlot, ySlot - 1, zSlot, 1, 0.0f, 0.0f, 0.0f);
|
||||
}
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ public class TileMiningWell extends TileMachine implements IMachine, IPowerRecep
|
|||
}
|
||||
|
||||
if (Utils.addToRandomPipeEntry(this, ForgeDirection.UNKNOWN, stack) && stack.stackSize <= 0)
|
||||
return;
|
||||
continue;
|
||||
|
||||
// Throw the object away.
|
||||
// TODO: factorize that code
|
||||
|
|
Loading…
Reference in a new issue