Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-02-20 22:19:34 +00:00
commit b08bca67d4
42 files changed
+302 -212

No files matched your search

@@ -58,7 +58,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeInt(general.armoredJetpackDamageMax);
dataStream.writeBoolean(general.aestheticWorldDamage);
dataStream.writeBoolean(general.opsBypassRestrictions);
dataStream.writeDouble(general.solarEvaporationSpeed);
dataStream.writeDouble(general.thermalEvaporationSpeed);
dataStream.writeInt(general.maxJetpackGas);
dataStream.writeInt(general.maxScubaGas);
dataStream.writeInt(general.maxFlamethrowerGas);
@@ -141,7 +141,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
general.armoredJetpackDamageMax = dataStream.readInt();
general.aestheticWorldDamage = dataStream.readBoolean();
general.opsBypassRestrictions = dataStream.readBoolean();
general.solarEvaporationSpeed = dataStream.readDouble();
general.thermalEvaporationSpeed = dataStream.readDouble();
general.maxJetpackGas = dataStream.readInt();
general.maxScubaGas = dataStream.readInt();
general.maxFlamethrowerGas = dataStream.readInt();