From f72045438e13e63c90394e2d2cf38013cb61c994 Mon Sep 17 00:00:00 2001 From: lucas lelievre Date: Sat, 30 Apr 2022 21:37:02 +0200 Subject: [PATCH] Change getTrackerById --- src/main/java/dev/slimevr/VRServer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/slimevr/VRServer.java b/src/main/java/dev/slimevr/VRServer.java index 48bd6f30a..a54366c59 100644 --- a/src/main/java/dev/slimevr/VRServer.java +++ b/src/main/java/dev/slimevr/VRServer.java @@ -309,9 +309,11 @@ public class VRServer extends Thread { for (Tracker tracker : trackers) { if (tracker.getTrackerNum() != id.getTrackerNum()) continue; - if (tracker.getDevice() == null && id.getDeviceId() != null) - continue; - if (tracker.getDevice() != null && id.getDeviceId() == null) + // A tracker id is a combination of two data, the device id (optional) and the tracker num + // tracker.getDevice() can be null for synthetic trackers + // if device id is null but the tracker id has a device id, the tracker should be skipped + // On the other hand if the tracker has a device id but the TrackerId does not have one we should also skip + if (tracker.getDevice() == null ^ id.getDeviceId() == null) continue; if (tracker.getDevice().getId() != id.getDeviceId().getId()) continue;