mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 20:42:17 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/common/item/ItemBlockEnergyCube.java src/main/java/mekanism/common/multipart/PartTransmitter.java src/main/java/mekanism/common/tile/TileEntityBasicMachine.java src/main/java/mekanism/common/tile/TileEntityBin.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/TileEntityFactory.java src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java src/main/java/mekanism/common/tile/TileEntityPortableTank.java src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java src/main/java/mekanism/common/tile/TileEntityTeleporter.java src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
This commit is contained in:
commit
d5508667f3
35 files changed
+144
-93
No files matched your search
@@ -7,6 +7,7 @@ import java.util.List;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.Range4D;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.MekanismConfig.usage;
|
||||
import mekanism.api.gas.Gas;
|
||||
@@ -157,7 +158,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
|
||||
|
||||
if(updateDelay == 0 && clientActive != isActive)
|
||||
{
|
||||
Mekanism.packetHandler.sendToAll(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())));
|
||||
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -784,7 +785,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
|
||||
|
||||
if(clientActive != active && updateDelay == 0)
|
||||
{
|
||||
Mekanism.packetHandler.sendToAll(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())));
|
||||
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
|
||||
|
||||
updateDelay = 10;
|
||||
clientActive = active;
|
||||
|
||||
Reference in new issue
Block a user