From dc2a32fc5af6b1d5ddfd987e4e19bed8e9f0fe2a Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 09:27:04 -0300 Subject: [PATCH 1/2] fix direction parameters choosing the wrong directions, fix #2454 --- .../buildcraft/core/statements/StatementParameterDirection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 90e91626..ff5e1f28 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -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)); } } From 99501d7b034d1bbb418c18c0611a4dd3559212fd Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 10:06:15 -0300 Subject: [PATCH 2/2] fix style --- common/buildcraft/transport/BlockGenericPipe.java | 1 - common/buildcraft/transport/pipes/PipeItemsStripes.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 98406ce5..5611b6da 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -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; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 620aab57..5604a380 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -112,7 +112,7 @@ public class PipeItemsStripes extends Pipe 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; }