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

Merge pull request #2468 from hea3ven/6.4.x

Browse source 
fix direction parameters choosing the wrong directions, fix #2454
This commit is contained in:
Adrian Siekierka 2015-02-18 11:41:32 +01:00
commit 194e1adb50
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/core/statements/StatementParameterDirection.java
View file

@ -51,7 +51,7 @@ public class StatementParameterDirection implements IStatementParameter {
if (source.getTile() instanceof TileGenericPipe) {
do {
direction = ForgeDirection.getOrientation((direction.ordinal() + (mouse.getButton() > 0 ? -1 : 1)) % 6);
} while (((TileGenericPipe) source.getTile()).isPipeConnected(direction));
} while (!((TileGenericPipe) source.getTile()).isPipeConnected(direction));
}
}

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

@ -55,7 +55,6 @@ import buildcraft.api.events.PipePlacedEvent;
import buildcraft.api.events.RobotPlacementEvent;
import buildcraft.api.gates.GateExpansions;
import buildcraft.api.gates.IGateExpansion;
import buildcraft.api.robots.EntityRobotBase;
import buildcraft.api.tools.IToolWrench;
import buildcraft.api.transport.IPipe;
import buildcraft.api.transport.IPipeTile;

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

@ -112,7 +112,7 @@ public class PipeItemsStripes extends Pipe<PipeTransportItems> implements IEnerg
}
}
if(defaultItemsHandler.handle(getWorld(), (int) p.x, (int) p.y, (int) p.z,
if (defaultItemsHandler.handle(getWorld(), (int) p.x, (int) p.y, (int) p.z,
event.direction, stack, player, this)) {
event.entity = null;
}