Fixed potential desyncs

This commit is contained in:
aidancbrady committed 2017-08-11 09:30:42 -07:00
1 parent 1937d81b81
commit f58924bc03
2 files changed
+4 -5

No files matched your search

@@ -9,7 +9,6 @@ import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;
import mekanism.common.PacketHandler;
import mekanism.common.Tier;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.frequency.Frequency;
import mekanism.common.util.InventoryUtils;
import net.minecraft.item.ItemStack;
@@ -25,7 +24,6 @@ public class InventoryFrequency extends Frequency
{
public static final String ENTANGLOPORTER = "Entangloporter";
public static final double MAX_ENERGY = general.quantumEntangloporterEnergyTransfer;
public static final int FLUID_TANK_SIZE = Tier.FluidTankTier.ULTIMATE.output;
public static final int GAS_TANK_SIZE = Tier.GasTankTier.ULTIMATE.output;
@@ -26,6 +26,7 @@ import mekanism.common.base.ITankManager;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.chunkloading.IChunkLoader;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.content.entangloporter.InventoryFrequency;
import mekanism.common.frequency.Frequency;
import mekanism.common.frequency.FrequencyManager;
@@ -438,7 +439,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
@Override
public double getMaxOutput()
{
return !hasFrequency() ? 0 : InventoryFrequency.MAX_ENERGY;
return !hasFrequency() ? 0 : general.quantumEntangloporterEnergyTransfer;
}
@Override
@@ -452,14 +453,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
{
if(hasFrequency())
{
frequency.storedEnergy = Math.min(InventoryFrequency.MAX_ENERGY, energy);
frequency.storedEnergy = Math.min(general.quantumEntangloporterEnergyTransfer, energy);
}
}
@Override
public double getMaxEnergy()
{
return !hasFrequency() ? 0 : InventoryFrequency.MAX_ENERGY;
return !hasFrequency() ? 0 : general.quantumEntangloporterEnergyTransfer;
}
@Override