This commit is contained in:
aidancbrady committed 2017-04-27 23:02:23 -04:00
1 parent 808f0cdf8a
commit bb473a3100
2 files changed
+2 -2

No files matched your search

@@ -36,7 +36,7 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
* @param ticksRequired - ticks required to operate -- or smelt an item.
* @param maxEnergy - maximum energy this machine can hold.
*/
public TileEntityElectricMachine(String soundPath, String name, double perTick, double maxEnergy, int ticksRequired)
public TileEntityElectricMachine(String soundPath, String name, double maxEnergy, double perTick, int ticksRequired)
{
super(soundPath, name, maxEnergy, perTick, 3, ticksRequired, MekanismUtils.getResource(ResourceType.GUI, "GuiBasicMachine.png"));
@@ -124,7 +124,7 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements
if(FMLCommonHandler.instance().getEffectiveSide().isClient())
{
isActive = dataStream.readBoolean();
clientActive = dataStream.readBoolean();
controlType = RedstoneControl.values()[dataStream.readInt()];
if(updateDelay == 0 && clientActive != isActive)