tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed a race condition with Marx generator discharges (probably, as usual with race conditions)

Browse source
This commit is contained in:
malte0811 2017-10-08 18:39:15 +02:00
parent ab77d28bc9
commit f33650280e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/malte0811/industrialWires/blocks/hv/TileEntityMarx.java
View file

@ -221,13 +221,13 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
FIRING_GENERATORS.remove(this);
switch (state) {
case NEXT_TICK:
state = FIRE;
if (world.isRemote) {
FIRING_GENERATORS.add(this);
IndustrialWires.proxy.playMarxBang(this, getMiddle(), (float) getNormedEnergy(dischargeData.energy));
} else {
fire();
}
state = FIRE;
break;
case FIRE:
state = FiringState.CHARGING;
@ -412,7 +412,6 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
@Override
public void onSync(NBTTagCompound nbt) {
state = FiringState.NEXT_TICK;
float energy = nbt.getFloat("energy");
if (energy>0) {
genDischarge(energy, nbt.getInteger("randSeed"));
@ -422,6 +421,7 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
}
dischargeData.energy = energy;
}
state = FiringState.NEXT_TICK;
}
private void genDischarge(float energy, int seed) {