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

Merge branch 'gate-triggers-plugs' of https://github.com/Prototik/BuildCraft into Prototik-gate-triggers-plugs

Browse source
This commit is contained in:
SpaceToad 2014-05-05 14:37:51 +02:00
commit f02dda793d
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/transport/Gate.java
View file

@ -322,7 +322,7 @@ public final class Gate {
if (trigger instanceof ITileTrigger) { if (trigger instanceof ITileTrigger) {
for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) {
TileEntity tile = pipe.container.getTile(o); TileEntity tile = pipe.container.getTile(o);
if (tile != null && !(tile instanceof TileGenericPipe)) { if (tile != null && !(tile instanceof TileGenericPipe) && pipe.hasGate(o)) {
if (((ITileTrigger) trigger).isTriggerActive(o.getOpposite(), tile, parameter)) { if (((ITileTrigger) trigger).isTriggerActive(o.getOpposite(), tile, parameter)) {
return true; return true;
} }

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

@ -95,10 +95,12 @@ public class ContainerGateInterface extends BuildCraftContainer {
} }
for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) {
TileEntity tile = pipe.container.getTile(o); if (pipe.hasGate(o)) {
Block block = pipe.container.getBlock(o); TileEntity tile = pipe.container.getTile(o);
potentialTriggers.addAll(ActionManager.getNeighborTriggers(block, tile)); Block block = pipe.container.getBlock(o);
potentialActions.addAll(ActionManager.getNeighborActions(block, tile)); potentialTriggers.addAll(ActionManager.getNeighborTriggers(block, tile));
potentialActions.addAll(ActionManager.getNeighborActions(block, tile));
}
} }
if (!pipe.gate.material.hasParameterSlot) { if (!pipe.gate.material.hasParameterSlot) {