From d7fc6f9f4993de48b432104604b2ec9c5726777b Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Fri, 29 Mar 2024 02:58:25 -0400
Subject: [PATCH] [F] Fix music difficulty unlock conflict

---
 src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
index cd0229c5..b5452739 100644
--- a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
@@ -222,7 +222,8 @@ fun WaccaServer.init() {
         if (recv.isEmpty()) return
         val newItems = mutableListOf<WcUserItem>()
         recv.forEach { (type, id, param) ->
-            val ex = items[type]?.get(id)
+            var ex = items[type]?.get(id)
+            if (type == MUSIC_DIFFICULTY_UNLOCK()) ex = ex ?: items[MUSIC_UNLOCK()]?.get(id)
             when (type) {
                 WP() -> { u.wp += param; u.wpTotal += param }
                 XP() -> u.xp += param
@@ -306,6 +307,8 @@ fun WaccaServer.init() {
             rating = waccaRating(achievement, pl.levelConst)
         })
 
+        // TODO: Update player rating - Best 35 old & 15 new
+
         // Re-calculate user total score
         rp.user.save(u.apply { totalScore = rp.bestScore.sumScoreByUser(u) })