diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt index e9e7429..b75ada3 100644 --- a/src/main/kotlin/net/taehui/twilight/system/DB.kt +++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt @@ -2208,13 +2208,13 @@ } } } - },logValueFuture { + }, logValueFuture { pool.connection.use { db -> db.prepareStatement( """ SELECT COUNT(Level_ID) AS Count FROM tw_level - WHERE Avatar_ID = ? + WHERE Avatar = ? """.trimIndent() ).use { dbStatement -> dbStatement.setString(1, avatarID) @@ -2518,10 +2518,10 @@ pool.connection.use { db -> db.prepareStatement( """ - SELECT tw_note.Note_ID, Note_ID_128, Note_ID_256, Title, Artist, Genre, Level_Text, Level, Stand - FROM tw_note, tw_comment - WHERE tw_note.Note_ID = tw_comment.Note_ID AND Avatar = ? AND Is_Max = true - """.trimIndent() + SELECT tw_note.Note_ID, Note_ID_128, Note_ID_256, Title, Artist, Genre, Level_Text, Level, Stand + FROM tw_note, tw_comment + WHERE tw_note.Note_ID = tw_comment.Note_ID AND Avatar = ? AND Is_Max = true + """.trimIndent() ).use { dbStatement -> dbStatement.setString(1, avatarID) dbStatement.executeQuery().use { @@ -2557,7 +2557,7 @@ fun setLevelID(levelID: String) { val avatarLevelVSItems = mutableSetOf() val targetLevelVSItems = mutableSetOf() - (if (levelName == "*") avatarLevelVSMap.keys.intersect(targetLevelVSMap.keys) else avatarLevelVSMap.filter { + (if (levelID == "*") avatarLevelVSMap.keys.intersect(targetLevelVSMap.keys) else avatarLevelVSMap.filter { AbilitySystem.getAbilityIDs(it.value.noteID128, it.value.noteID256) .contains(levelID) }.keys @@ -2578,19 +2578,19 @@ targetLevelVSItems.add(targetLevelVSItem) } } - data[levelID] = object { - val avatarLevelVSCount = avatarLevelVSItems.size - val targetLevelVSCount = targetLevelVSItems.size - val avatarLevelVSItems = avatarLevelVSItems.sortedBy { it.levelVSStand }.take(50) - val targetLevelVSItems = targetLevelVSItems.sortedByDescending { it.levelVSStand }.take(50) - } } + data[levelID] = object { + val avatarLevelVSCount = avatarLevelVSItems.size + val targetLevelVSCount = targetLevelVSItems.size + val avatarLevelVSItems = avatarLevelVSItems.sortedBy { it.levelVSStand }.take(50) + val targetLevelVSItems = targetLevelVSItems.sortedByDescending { it.levelVSStand }.take(50) + } } if (levelName == "*") { setLevelID("*") } else { - AbilitySystem.getAbilityIDs(levelName).forEach { setLevelID(it) } + arrayOf("*").plus(AbilitySystem.getAbilityIDs(levelName)).forEach { setLevelID(it) } } data