diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 11f105fdc..5621d605d 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -158,11 +158,12 @@ public class CableBusBlock extends AEBaseTileBlock implement @Override public boolean canConnectRedstone(final BlockState state, final IBlockReader w, final BlockPos pos, Direction side) { + // TODO: Verify this. if (side == null) { - side = Direction.UP; + return false; } - return this.cb(w, pos).canConnectRedstone(EnumSet.of(side)); + return this.cb(w, pos).canConnectRedstone(side.getOpposite()); } @Override diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 2f4741ffa..31c231699 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -623,14 +623,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } @Override - public boolean canConnectRedstone(final EnumSet enumSet) { - for (final Direction dir : enumSet) { - final IPart part = this.getPart(dir); - if (part != null && part.canConnectRedstone()) { - return true; - } - } - return false; + public boolean canConnectRedstone(final Direction opposite) { + final IPart part = this.getPart(opposite); + return part != null && part.canConnectRedstone(); } @Override diff --git a/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java index 06f7207d6..ebd5d0bca 100644 --- a/src/main/java/appeng/parts/ICableBusContainer.java +++ b/src/main/java/appeng/parts/ICableBusContainer.java @@ -18,7 +18,6 @@ package appeng.parts; -import java.util.EnumSet; import java.util.Random; import net.minecraft.entity.Entity; @@ -43,7 +42,7 @@ public interface ICableBusContainer { int isProvidingWeakPower(Direction opposite); - boolean canConnectRedstone(EnumSet of); + boolean canConnectRedstone(Direction opposite); void onEntityCollision(Entity e); diff --git a/src/main/java/appeng/parts/NullCableBusContainer.java b/src/main/java/appeng/parts/NullCableBusContainer.java index 0b853e001..7ce6a5470 100644 --- a/src/main/java/appeng/parts/NullCableBusContainer.java +++ b/src/main/java/appeng/parts/NullCableBusContainer.java @@ -18,7 +18,6 @@ package appeng.parts; -import java.util.EnumSet; import java.util.Random; import net.minecraft.entity.Entity; @@ -48,7 +47,7 @@ public class NullCableBusContainer implements ICableBusContainer { } @Override - public boolean canConnectRedstone(final EnumSet of) { + public boolean canConnectRedstone(final Direction opposite) { return false; }