From b41f3b9370672c300e7de47a5a837e063d8fba67 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Tue, 2 Apr 2024 02:07:39 -0400
Subject: [PATCH] [F] Fix jvm name clash

---
 src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt  | 8 ++++----
 .../icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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 36bff1af..f2a9d546 100644
--- a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt
@@ -358,7 +358,7 @@ fun WaccaServer.init() {
         addItems(ls(ls(MUSIC_UNLOCK(), songId.int(), diff.int())), u, items)
         useItems(itemUsed as List<List<Int>>, u, items)
 
-        ls(u.getWp(), rp.item.findByUserAndType(u, TICKET()).map { it.ls() })
+        ls(u.moddedWp, rp.item.findByUserAndType(u, TICKET()).map { it.ls() })
     }
 
     "user/goods/purchase" { _, (uid, pid, count, purchaseType, cost, items) ->
@@ -369,7 +369,7 @@ fun WaccaServer.init() {
         // WP Purchase = 2, Credit purchase = 1
         if (purchaseType == 2) useItems(ls(ls(WP(), 0, cost.int())), u, itemsMap)
 
-        ls(u.getWp(), rp.item.findByUserAndType(u, TICKET()).map { it.ls() })
+        ls(u.moddedWp, rp.item.findByUserAndType(u, TICKET()).map { it.ls() })
     }
 
     "user/rating/update" empty { _, (uid, newRating, songs) ->
@@ -460,13 +460,13 @@ fun WaccaServer.init() {
     // TODO: Test this
     "user/vip/get" { _, (uid) ->
         val u = user(uid) ?: (404 - "User not found")
-        val vipDays = (u.getVipExpire().time - millis()) / (24 * 60 * 60 * 1000)
+        val vipDays = (u.moddedVipExpire.time - millis()) / (24 * 60 * 60 * 1000)
         ls(vipDays, ls(1, 1, "presents" - empty))
     }
 
     "user/vip/start" { _, (uid, cost, days) ->
         val u = user(uid) ?: (404 - "User not found")
         rp.user.save(u.apply { vipExpireTime = Date(millis() + days.int() * (24 * 60 * 60 * 1000)) })
-        ls(u.getVipExpire().sec, "presents" - empty)
+        ls(u.moddedVipExpire.sec, "presents" - empty)
     }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt b/src/main/java/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt
index 51305e38..345b2b81 100644
--- a/src/main/java/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt
@@ -60,13 +60,13 @@ class WaccaUser : BaseEntity(), IUserData {
     override var totalScore = 0L
 
     fun lStatus() = ls(card?.extId,
-        userName, 1, xp, danLevel, danType, getWp(), ls(0, 0, 0), loginCount, loginCountDays,
-        (loginCount - 1).coerceAtLeast(0), loginCountDaysConsec, getVipExpire().sec, loginCountToday, this.playerRating
+        userName, 1, xp, danLevel, danType, moddedWp, ls(0, 0, 0), loginCount, loginCountDays,
+        (loginCount - 1).coerceAtLeast(0), loginCountDaysConsec, moddedVipExpire.sec, loginCountToday, this.playerRating
     )
 
-    fun getVipExpire() =
+    val moddedVipExpire get() =
         if (card?.aquaUser?.gameOptions?.waccaAlwaysVip == true) "2077-01-01".isoDate().toDate()
         else vipExpireTime
 
-    fun getWp() = if (card?.aquaUser?.gameOptions?.waccaInfiniteWp == true) 999999 else wp
+    val moddedWp get() = if (card?.aquaUser?.gameOptions?.waccaInfiniteWp == true) 999999 else wp
 }
\ No newline at end of file