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

Inventory triggers should not be side specific by default, following #1886

Browse source
This commit is contained in:
SpaceToad 2014-06-16 23:37:42 +02:00
parent fa98a71d18
commit ff0307702e
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/core/triggers/BCTrigger.java
View file

@ -35,7 +35,7 @@ public abstract class BCTrigger extends BCStatement implements ITrigger {
Pipe<?> pipe = (Pipe<?>) gate.getPipe(); Pipe<?> pipe = (Pipe<?>) gate.getPipe();
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
if (isTriggerActive(side.getOpposite(), pipe.getAdjacentTile(side), p)) { if (isTriggerActive(side, pipe.getAdjacentTile(side), p)) {
return true; return true;
} }
} }

2
common/buildcraft/transport/gui/ContainerGateInterface.java
View file

@ -111,13 +111,11 @@ public class ContainerGateInterface extends BuildCraftContainer {
potentialTriggers.addAll(pipe.container.getTriggers()); potentialTriggers.addAll(pipe.container.getTriggers());
for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) {
if (pipe.hasGate(o)) {
TileEntity tile = pipe.container.getTile(o); TileEntity tile = pipe.container.getTile(o);
Block block = pipe.container.getBlock(o); Block block = pipe.container.getBlock(o);
potentialTriggers.addAll(StatementManager.getNeighborTriggers(block, tile)); potentialTriggers.addAll(StatementManager.getNeighborTriggers(block, tile));
potentialActions.addAll(StatementManager.getNeighborActions(block, tile)); potentialActions.addAll(StatementManager.getNeighborActions(block, tile));
} }
}
if (gate.material.numTriggerParameters == 0) { if (gate.material.numTriggerParameters == 0) {
Iterator<ITrigger> it = potentialTriggers.iterator(); Iterator<ITrigger> it = potentialTriggers.iterator();