mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8.9
* development: Fixed packet security Fixed 'other dust' registration Better fake player reporting, thanks to @DraksterAU Conflicts: src/main/java/mekanism/common/item/ItemOtherDust.java src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java src/main/java/mekanism/common/tile/TileEntityBasicBlock.java src/main/java/mekanism/common/tile/TileEntityBasicMachine.java src/main/java/mekanism/common/tile/TileEntityBin.java src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java src/main/java/mekanism/common/tile/TileEntityChargepad.java src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java src/main/java/mekanism/common/tile/TileEntityDynamicTank.java src/main/java/mekanism/common/tile/TileEntityElectricPump.java src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java src/main/java/mekanism/common/tile/TileEntityEnergyCube.java src/main/java/mekanism/common/tile/TileEntityFactory.java src/main/java/mekanism/common/tile/TileEntityFluidTank.java src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java src/main/java/mekanism/common/tile/TileEntityGasTank.java src/main/java/mekanism/common/tile/TileEntityInductionCell.java src/main/java/mekanism/common/tile/TileEntityInductionPort.java src/main/java/mekanism/common/tile/TileEntityInductionProvider.java src/main/java/mekanism/common/tile/TileEntityLaser.java src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java src/main/java/mekanism/common/tile/TileEntityMultiblock.java src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
This commit is contained in:
commit
20bd989687
57 files changed
+1157
-988
No files matched your search
@@ -314,12 +314,15 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||
{
|
||||
super.handlePacketData(dataStream);
|
||||
|
||||
if(dataStream.readBoolean())
|
||||
if(worldObj.isRemote)
|
||||
{
|
||||
gasTank.setGas(new GasStack(dataStream.readInt(), dataStream.readInt()));
|
||||
}
|
||||
else {
|
||||
gasTank.setGas(null);
|
||||
if(dataStream.readBoolean())
|
||||
{
|
||||
gasTank.setGas(new GasStack(dataStream.readInt(), dataStream.readInt()));
|
||||
}
|
||||
else {
|
||||
gasTank.setGas(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user