From 25f53232cd2d8c1908abbde82b2754c6521e906c Mon Sep 17 00:00:00 2001 From: Eiren Rain Date: Thu, 20 Jan 2022 20:27:23 +0200 Subject: [PATCH] Fix packet number reading --- .../dev/slimevr/vr/trackers/TrackersUDPServer.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java b/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java index eb71b8e31..3d9dd58d0 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java @@ -213,15 +213,14 @@ public class TrackersUDPServer extends Thread { connection = trackersMap.get(recieve.getAddress()); } int packetId = bb.getInt(); - long packetNumber = bb.getLong(); + // TODO Ping is not working at all + long packetNumber = packetId != 10 ? bb.getLong() : 0; if(connection != null) { - if(packetId != 10) { - if(!connection.isNextPacket(packetNumber)) { - // Skip packet because it's not next - LogManager.log.warning("[TrackerServer] Out of order packet received: id " + packetId + ", number " + packetNumber + ", last " + connection.lastPacketNumber + ", from " + recieve.getSocketAddress()); - continue; - } + if(!connection.isNextPacket(packetNumber)) { + // Skip packet because it's not next + LogManager.log.warning("[TrackerServer] Out of order packet received: id " + packetId + ", number " + packetNumber + ", last " + connection.lastPacketNumber + ", from " + recieve.getSocketAddress()); + continue; } connection.lastPacket = System.currentTimeMillis(); }