From f2ceb84969b6d8e4e867ef2b8575f4d3d304d6ec Mon Sep 17 00:00:00 2001 From: Erimel Date: Mon, 4 Apr 2022 23:41:51 -0400 Subject: [PATCH] Null check on designation I forgor sowwy, this completely breaks the server whenever a new tracker (never connected before) connects. ;-; --- .../dev/slimevr/vr/trackers/TrackerPosition.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java index ac53b064e..3d1578fd1 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java @@ -4,8 +4,6 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import io.eiren.util.logging.LogManager; - public enum TrackerPosition { NONE("", TrackerRole.NONE), @@ -41,10 +39,12 @@ public enum TrackerPosition { public static TrackerPosition getByDesignation(String designation) { // Support old configs. leg was renamed to knee. - if(designation.equals("body:left_leg")) - designation = "body:left_knee"; - if(designation.equals("body:right_leg")) - designation = "body:right_knee"; + if(designation != null) { + if(designation.equals("body:left_leg")) + designation = "body:left_knee"; + if(designation.equals("body:right_leg")) + designation = "body:right_knee"; + } return designation == null ? null : byDesignation.get(designation.toLowerCase()); }