tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix connections

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-03 11:16:30 -05:00
parent a4d1b191e9
commit 7956748e8f
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/multipart/PartUniversalCable.java
View file

@ -65,7 +65,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork, Double> i
@Override @Override
public boolean isValidAcceptor(TileEntity acceptor, ForgeDirection side) public boolean isValidAcceptor(TileEntity acceptor, ForgeDirection side)
{ {
return CableUtils.canConnectToAcceptor(side, acceptor); return CableUtils.isConnectable(tile(), acceptor, side.getOpposite());
} }
@Override @Override

7
common/mekanism/common/util/CableUtils.java
View file

@ -164,6 +164,11 @@ public final class CableUtils
TileEntity tileEntity = Object3D.get(tile).getFromSide(side).getTileEntity(tile.worldObj); 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) if(tileEntity instanceof ITransmitter)
{ {
return false; return false;
@ -174,7 +179,7 @@ public final class CableUtils
return true; return true;
} }
if(tileEntity instanceof IEnergyAcceptor && ((IEnergyAcceptor)tileEntity).acceptsEnergyFrom(tile, side.getOpposite())) if(tileEntity instanceof IEnergyAcceptor && ((IEnergyAcceptor)tileEntity).acceptsEnergyFrom(orig, side.getOpposite()))
{ {
return true; return true;
} }