diff --git a/server/netty/src/com/riiablo/net/reliable/MessageChannel.java b/server/netty/src/com/riiablo/net/reliable/MessageChannel.java index f9b56cb2..333fa441 100644 --- a/server/netty/src/com/riiablo/net/reliable/MessageChannel.java +++ b/server/netty/src/com/riiablo/net/reliable/MessageChannel.java @@ -18,6 +18,14 @@ public abstract class MessageChannel implements ReliablePacketController.PacketL this.packetController = new ReliablePacketController(config, this); } + public int nextSequence() { + return sequence; + } + + protected int incSequence() { + return sequence = (sequence + 1) & Packet.USHORT_MAX_VALUE; + } + public abstract void reset(); public abstract void update(float delta, int channelId, DatagramChannel ch); public abstract void sendMessage(int channelId, DatagramChannel ch, ByteBuf bb); diff --git a/server/netty/src/com/riiablo/net/reliable/ReliablePacketController.java b/server/netty/src/com/riiablo/net/reliable/ReliablePacketController.java index 9a41e5d9..30fb57c5 100644 --- a/server/netty/src/com/riiablo/net/reliable/ReliablePacketController.java +++ b/server/netty/src/com/riiablo/net/reliable/ReliablePacketController.java @@ -43,14 +43,6 @@ public class ReliablePacketController { this.fragmentReassembly = new SequenceBuffer<>(FragmentReassemblyData.class, config.fragmentReassemblyBufferSize); } - public int nextSequence() { - return channel.sequence; - } - - private int incSequence() { - return channel.sequence = (channel.sequence + 1) & Packet.USHORT_MAX_VALUE; - } - public float rtt() { return rtt; } @@ -204,7 +196,7 @@ public class ReliablePacketController { return -1; } - final int sequence = incSequence(); + final int sequence = channel.incSequence(); int ack, ackBits; synchronized (receivedPackets) { ack = receivedPackets.generateAck();