diff --git a/packages/cultnet-rs/src/rudp.rs b/packages/cultnet-rs/src/rudp.rs index c4343a56..8b47f9e7 100644 --- a/packages/cultnet-rs/src/rudp.rs +++ b/packages/cultnet-rs/src/rudp.rs @@ -359,7 +359,9 @@ impl CultNetRudpSession { if packet.packet_type == CultNetRudpPacketType::Ack || packet.packet_type == CultNetRudpPacketType::Pong { - self.remember_received(packet.sequence); + if packet.packet_type == CultNetRudpPacketType::Pong { + self.remember_received(packet.sequence); + } return Ok(CultNetRudpReceiveResult { delivered: Vec::new(), reply: None, @@ -437,14 +439,22 @@ impl CultNetRudpSession { } pub fn create_ack(&mut self) -> CultNetRudpPacket { - self.create_packet( - CultNetRudpPacketType::Ack, - "control", - Vec::new(), - false, - false, - false, - ) + let (ack, ack_mask) = self.ack_state(); + CultNetRudpPacket { + packet_type: CultNetRudpPacketType::Ack, + connection_id: self.connection_id, + sequence: 0, + ack, + ack_mask, + channel_id: "control".to_string(), + reliable: false, + ordered: false, + sequenced: false, + fragment_id: 0, + fragment_index: 0, + fragment_count: 0, + payload: Vec::new(), + } } pub fn create_ping(&mut self, payload: Vec) -> CultNetRudpPacket { diff --git a/packages/cultnet-rs/tests/cultnet.rs b/packages/cultnet-rs/tests/cultnet.rs index e72a93a1..6511fdbd 100644 --- a/packages/cultnet-rs/tests/cultnet.rs +++ b/packages/cultnet-rs/tests/cultnet.rs @@ -992,6 +992,8 @@ fn rudp_session_skips_control_packets_while_ordering_schema_payloads() -> Result let first = sender.send("schema", b"first".to_vec(), options.clone())?; let control = sender.create_ack(); let second = sender.send("schema", b"second".to_vec(), options)?; + assert_eq!(control.sequence, 0); + assert_eq!(second.sequence, first.sequence + 1); assert_eq!( receiver