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

Hopefully fixed an issue

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-17 22:25:54 -05:00
parent 25699f969d
commit 1152470dd6
3 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/mekanism/api/gas/GasNetwork.java
View file

@ -424,10 +424,6 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
}
}
gasScale = 0;
refGas = null;
gasStored = null;
return network;
}

18
common/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -166,13 +166,8 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
if(TransmissionType.checkTransmissionType(nodeTile, getTransmissionType(), (TileEntity)transmitter))
{
ITransmitter<N> trans = (ITransmitter<N>)nodeTile;
if(trans.getTransmitterNetwork(false) == null || isValidMerger(nodeTile))
{
((ITransmitter<N>)nodeTile).removeFromTransmitterNetwork();
newTransporters.add((ITransmitter<N>)nodeTile);
}
((ITransmitter<N>)nodeTile).removeFromTransmitterNetwork();
newTransporters.add((ITransmitter<N>)nodeTile);
}
}
@ -208,7 +203,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
{
TileEntity connectedBlockA = connectedBlocks[count];
if(TransmissionType.checkTransmissionType(connectedBlockA, getTransmissionType()) && isValidMerger(connectedBlockA) && !dealtWith[count])
if(TransmissionType.checkTransmissionType(connectedBlockA, getTransmissionType()) && !dealtWith[count])
{
NetworkFinder finder = new NetworkFinder(((TileEntity)splitPoint).worldObj, getTransmissionType(), Object3D.get(connectedBlockA), Object3D.get((TileEntity)splitPoint));
List<Object3D> partNetwork = finder.exploreNetwork();
@ -222,7 +217,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
TileEntity connectedBlockB = connectedBlocks[check];
if(TransmissionType.checkTransmissionType(connectedBlockB, getTransmissionType()) && isValidMerger(connectedBlockB) && !dealtWith[check])
if(TransmissionType.checkTransmissionType(connectedBlockB, getTransmissionType()) && !dealtWith[check])
{
if(partNetwork.contains(Object3D.get(connectedBlockB)))
{
@ -264,11 +259,6 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
}
}
public boolean isValidMerger(TileEntity tileEntity)
{
return true;
}
@Override
public void onNetworksCreated(List<N> networks) {}

4
common/mekanism/common/FluidNetwork.java
View file

@ -401,10 +401,6 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
}
}
fluidScale = 0;
refFluid = null;
fluidStored = null;
return network;
}