From ff0307702e3585f0ba51be0cde6c7f692f97a835 Mon Sep 17 00:00:00 2001 From: SpaceToad Date: Mon, 16 Jun 2014 23:37:42 +0200 Subject: [PATCH] Inventory triggers should not be side specific by default, following #1886 --- common/buildcraft/core/triggers/BCTrigger.java | 2 +- .../transport/gui/ContainerGateInterface.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common/buildcraft/core/triggers/BCTrigger.java b/common/buildcraft/core/triggers/BCTrigger.java index c2255d60..67f06937 100644 --- a/common/buildcraft/core/triggers/BCTrigger.java +++ b/common/buildcraft/core/triggers/BCTrigger.java @@ -35,7 +35,7 @@ public abstract class BCTrigger extends BCStatement implements ITrigger { Pipe pipe = (Pipe) gate.getPipe(); for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if (isTriggerActive(side.getOpposite(), pipe.getAdjacentTile(side), p)) { + if (isTriggerActive(side, pipe.getAdjacentTile(side), p)) { return true; } } diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index b72cbd6d..0050baa0 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -111,12 +111,10 @@ public class ContainerGateInterface extends BuildCraftContainer { potentialTriggers.addAll(pipe.container.getTriggers()); for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { - if (pipe.hasGate(o)) { - TileEntity tile = pipe.container.getTile(o); - Block block = pipe.container.getBlock(o); - potentialTriggers.addAll(StatementManager.getNeighborTriggers(block, tile)); - potentialActions.addAll(StatementManager.getNeighborActions(block, tile)); - } + TileEntity tile = pipe.container.getTile(o); + Block block = pipe.container.getBlock(o); + potentialTriggers.addAll(StatementManager.getNeighborTriggers(block, tile)); + potentialActions.addAll(StatementManager.getNeighborActions(block, tile)); } if (gate.material.numTriggerParameters == 0) {