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

Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

Browse source
This commit is contained in:
SpaceToad 2014-05-24 13:37:27 +02:00
commit 6280266024
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/core/robots/EntityRobotPicker.java
View file

@ -96,7 +96,7 @@ public class EntityRobotPicker extends EntityRobot implements IInventory {
.getTileEntity(dockingStation.x, dockingStation.y,
dockingStation.z);
if (pipe.pipe.transport instanceof PipeTransportItems) {
if (pipe != null && pipe.pipe.transport instanceof PipeTransportItems) {
if (unloadTracker.markTimeIfDelay(worldObj)) {
for (int i = 0; i < inv.length; ++i) {
if (inv[i] != null) {