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

Merge pull request #688 from Flow86/patch-648

Browse source 
Resubmit for 1.5: fixes #648
This commit is contained in:
CovertJaguar 2013-03-18 13:01:05 -07:00
commit 39822878df
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -9,6 +9,7 @@
package buildcraft.transport; package buildcraft.transport;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.TreeMap; import java.util.TreeMap;
@ -466,6 +467,30 @@ public class BlockGenericPipe extends BlockContainer {
} }
@Override @Override
public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) {
if (CoreProxy.proxy.isRenderWorld(world))
return null;
ArrayList<ItemStack> list = new ArrayList<ItemStack>();
int count = quantityDropped(metadata, fortune, world.rand);
for (int i = 0; i < count; i++) {
Pipe pipe = getPipe(world, x, y, z);
if (pipe == null) {
pipe = pipeRemoved.get(new BlockIndex(x, y, z));
}
if (pipe != null) {
if (pipe.itemID > 0) {
pipe.dropContents();
list.add(new ItemStack(pipe.itemID, 1, damageDropped(metadata)));
}
}
}
return list;
}
public TileEntity createNewTileEntity(World var1) { public TileEntity createNewTileEntity(World var1) {
return new TileGenericPipe(); return new TileGenericPipe();
} }