Skip to content

Commit efc3e4a

Browse files
committed
Fix vrconfig load
1 parent 22d2cc9 commit efc3e4a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package dev.slimevr.config
22

33
class TrackingChecklistConfig {
4-
val ignoredStepsIds: MutableList<UByte> = mutableListOf()
4+
val ignoredStepsIds: MutableList<Int> = mutableListOf()
55
}

server/core/src/main/java/dev/slimevr/protocol/rpc/trackingchecklist/RPCTrackingChecklistHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class RPCTrackingChecklistHandler(
9191
}.toIntArray()
9292

9393
val stepsOffset = TrackingChecklistResponse.createStepsVector(fbb, stepsOffsets)
94-
val ignoredStepsOffset = TrackingChecklistResponse.createIgnoredStepsVector(fbb, api.server.configManager.vrConfig.trackingChecklist.ignoredStepsIds.toUByteArray())
94+
val ignoredStepsOffset = TrackingChecklistResponse.createIgnoredStepsVector(fbb, api.server.configManager.vrConfig.trackingChecklist.ignoredStepsIds.map { it.toUByte() }.toUByteArray())
9595
return TrackingChecklistResponse.createTrackingChecklistResponse(
9696
fbb,
9797
stepsOffset,

server/core/src/main/java/dev/slimevr/trackingchecklist/TrackingChecklistManager.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ class TrackingChecklistManager(private val vrServer: VRServer) : VRCConfigListen
305305
fun ignoreStep(step: TrackingChecklistStep, ignore: Boolean) {
306306
if (!step.ignorable) return
307307
val ignoredSteps = vrServer.configManager.vrConfig.trackingChecklist.ignoredStepsIds
308-
if (ignore && !ignoredSteps.contains(step.id)) {
309-
ignoredSteps.add(step.id)
308+
if (ignore && !ignoredSteps.contains(step.id.toInt())) {
309+
ignoredSteps.add(step.id.toInt())
310310
} else if (!ignore) {
311-
ignoredSteps.remove(step.id)
311+
ignoredSteps.remove(step.id.toInt())
312312
}
313313
vrServer.configManager.saveConfig()
314314
}

0 commit comments

Comments
 (0)