Fix silly bug about indexes starting at 2

thewca · Sep 29, 2020 · e7b0c43 · e7b0c43
1 parent 6491a76
commit e7b0c43
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...n/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/wcif/WCIFScrambleMatcher.kt b/...n/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/wcif/WCIFScrambleMatcher.kt
@@ -18,7 +18,7 @@ import java.security.Key
 import javax.crypto.Cipher
 
 object WCIFScrambleMatcher {
-    const val ID_PENDING = 0 // FIXME should this be -1?
+    const val ID_PENDING = 0
 
     // SCRAMBLE SET ENCRYPTION / DECRYPTION -----
 
@@ -222,9 +222,9 @@ object WCIFScrambleMatcher {
     private fun <T : IndexingIdProvider> buildReindexingMap(candidates: List<T>): Map<T, Int> {
         val forReindexing = candidates.filter { it.id == ID_PENDING }
         val maxAssignedId = (candidates - forReindexing)
-            .maxByOrNull { it.id }?.id ?: 1
+            .map { it.id }.maxOrNull() ?: ID_PENDING
 
-        return forReindexing.mapIndexed { i, elem -> elem to i + maxAssignedId + 1 }
+        return forReindexing.mapIndexed { i, elem -> elem to maxAssignedId + 1 + i }
             .toMap()
     }