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

Fixed transfer issue

Browse source
This commit is contained in:
Aidan Brady 2013-12-21 14:54:12 -05:00
parent d6ad61114e
commit 198305ff39
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,9 +200,9 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
}
@Override
public void tick()
public void onUpdate()
{
super.tick();
super.onUpdate();
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
{

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

@ -118,6 +118,8 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
@Override
public void tick()
{
boolean didFix = false;
if(!fixed)
{
ticksSinceCreate++;
@ -126,9 +128,18 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
{
ticksSinceCreate = 0;
fixMessedUpNetwork(transmitters.iterator().next());
didFix = true;
}
}
if(!didFix)
{
onUpdate();
}
}
public void onUpdate()
{
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
{
Iterator<DelayQueue> i = updateQueue.iterator();

5
common/mekanism/common/EnergyNetwork.java
View file

@ -14,6 +14,7 @@ import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.transmitters.TransmitterNetworkRegistry;
import mekanism.common.util.CableUtils;
import mekanism.common.util.ListUtils;
import mekanism.common.util.MekanismUtils;
@ -379,9 +380,9 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
}
@Override
public void tick()
public void onUpdate()
{
super.tick();
super.onUpdate();
clearJoulesTransmitted();

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

@ -202,9 +202,9 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
}
@Override
public void tick()
public void onUpdate()
{
super.tick();
super.onUpdate();
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
{