diff --git a/common/mekanism/common/multipart/PartUniversalCable.java b/common/mekanism/common/multipart/PartUniversalCable.java index 698f6ab51..5487a2708 100644 --- a/common/mekanism/common/multipart/PartUniversalCable.java +++ b/common/mekanism/common/multipart/PartUniversalCable.java @@ -65,7 +65,7 @@ public class PartUniversalCable extends PartTransmitter i @Override public boolean isValidAcceptor(TileEntity acceptor, ForgeDirection side) { - return CableUtils.canConnectToAcceptor(side, acceptor); + return CableUtils.isConnectable(tile(), acceptor, side.getOpposite()); } @Override diff --git a/common/mekanism/common/util/CableUtils.java b/common/mekanism/common/util/CableUtils.java index 89be8cdf3..754636183 100644 --- a/common/mekanism/common/util/CableUtils.java +++ b/common/mekanism/common/util/CableUtils.java @@ -164,6 +164,11 @@ public final class CableUtils TileEntity tileEntity = Object3D.get(tile).getFromSide(side).getTileEntity(tile.worldObj); + return isConnectable(tile, tileEntity, side); + } + + public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, ForgeDirection side) + { if(tileEntity instanceof ITransmitter) { return false; @@ -174,7 +179,7 @@ public final class CableUtils return true; } - if(tileEntity instanceof IEnergyAcceptor && ((IEnergyAcceptor)tileEntity).acceptsEnergyFrom(tile, side.getOpposite())) + if(tileEntity instanceof IEnergyAcceptor && ((IEnergyAcceptor)tileEntity).acceptsEnergyFrom(orig, side.getOpposite())) { return true; }