diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusAuth.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusAuth.java index f156a40..51d0c05 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusAuth.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusAuth.java @@ -13,17 +13,20 @@ public class NexusAuth implements ISerializable { SerialString uuid; SerialString passphrase; boolean reconnect; + long timestamp; public NexusAuth(String uuid, String passphrase, boolean reconnect){ this.uuid = new SerialString(uuid); this.passphrase = new SerialString(passphrase); this.reconnect = reconnect; + this.timestamp = System.currentTimeMillis(); } public NexusAuth(SerialString uuid, SerialString passphrase, boolean reconnect){ this.uuid = uuid; this.passphrase = passphrase; - this.reconnect = reconnect; + this.reconnect = reconnect; + this.timestamp = System.currentTimeMillis(); } @@ -32,6 +35,7 @@ public class NexusAuth implements ISerializable { this.uuid.writeToStream(stream); this.passphrase.writeToStream(stream); stream.writeBoolean(reconnect); + stream.writeLong(this.timestamp); } public static NexusAuth readFromStream(ByteArrayDataInput stream){ diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusData.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusData.java index 4c77dcb..f4c25a7 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusData.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/NexusData.java @@ -18,7 +18,7 @@ public class NexusData implements ISerializable { public SerialInt amountTileEnts; public SerialInt amountEntities; public SerialInt amountPlayers; - + long timestamp; public NexusData(SerialLong Packet_Outbound, SerialLong Packet_Inbound, SerialInt Chunk_Forced, SerialInt Chunk_Loaded, @@ -32,6 +32,7 @@ public class NexusData implements ISerializable { this.amountTileEnts = Amount_TileEnts; this.amountEntities = Amount_Entities; this.amountPlayers = Amount_Players; + this.timestamp = System.currentTimeMillis(); } @@ -45,6 +46,7 @@ public class NexusData implements ISerializable { this.amountTileEnts.writeToStream(stream); this.amountEntities.writeToStream(stream); this.amountPlayers.writeToStream(stream); + stream.writeLong(this.timestamp); } public static NexusData readFromStream(ByteArrayDataInput stream){ diff --git a/src/main/java/mcp/mobius/opis/network/PacketManager.java b/src/main/java/mcp/mobius/opis/network/PacketManager.java index 1e47d48..f60ae26 100644 --- a/src/main/java/mcp/mobius/opis/network/PacketManager.java +++ b/src/main/java/mcp/mobius/opis/network/PacketManager.java @@ -9,6 +9,7 @@ import io.netty.channel.SimpleChannelInboundHandler; import java.lang.reflect.Constructor; import java.util.ArrayList; +import java.util.ConcurrentModificationException; import java.util.EnumMap; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; @@ -257,12 +258,20 @@ public class PacketManager channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL); channels.get(SERVER).writeAndFlush(packet); - for (FakePlayer fakePlayer : RConHandler.fakePlayersRcon.keySet()){ - RConHandler.sendToPlayerRCon(packet, fakePlayer); - } + try{ + for (FakePlayer fakePlayer : RConHandler.fakePlayersRcon.keySet()){ + RConHandler.sendToPlayerRCon(packet, fakePlayer); + } + } catch (ConcurrentModificationException e){ + + } - for (FakePlayer fakePlayer : RConHandler.fakePlayersNexus.keySet()){ - RConHandler.sendToPlayerNexus(packet, fakePlayer); + try{ + for (FakePlayer fakePlayer : RConHandler.fakePlayersNexus.keySet()){ + RConHandler.sendToPlayerNexus(packet, fakePlayer); + } + } catch (ConcurrentModificationException e){ + } }