mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.9.4
* development: Fixed Turbines unable to be formed in other dimensions Bump version to 9.0.2 Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction Conflicts: src/main/java/mekanism/common/LaserManager.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/block/BlockMachine.java src/main/java/mekanism/common/entity/EntityFlame.java src/main/java/mekanism/common/tile/TileEntityBoilerValve.java src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java src/main/java/mekanism/common/tile/TileEntityLaser.java src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java src/main/java/mekanism/common/util/MekanismUtils.java src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
This commit is contained in:
commit
eb7c2d1b78
19 files changed
+38
-41
No files matched your search
@@ -251,7 +251,8 @@ public final class CableUtils
|
||||
|
||||
if(handler.canConnectEnergy(side.getOpposite()))
|
||||
{
|
||||
int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending*general.TO_TE), false);
|
||||
int toSend = Math.min((int)Math.round(currentSending*general.TO_TE), Integer.MAX_VALUE);
|
||||
int used = handler.receiveEnergy(side.getOpposite(), toSend, false);
|
||||
sent += used*general.FROM_TE;
|
||||
}
|
||||
}
|
||||
@@ -260,7 +261,7 @@ public final class CableUtils
|
||||
if(((IEnergySink)tileEntity).acceptsEnergyFrom((TileEntity)from, side.getOpposite()))
|
||||
{
|
||||
double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2);
|
||||
toSend = Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2);
|
||||
toSend = Math.min(Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE);
|
||||
sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user