lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[F] Fix card detection

pull/14/head
Azalea 2024-02-21 04:28:38 -05:00
parent ae03a700de
commit 823eea1f0a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/icu/samnyan/aqua/sega/general/service/CardService.kt
View File

@ -56,13 +56,14 @@ class CardService(val cardRepo: CardRepository) {
* 4. Any of (2) or (3) converted to a decimal string, which is honestly the same as (1) so ignore this case * 4. Any of (2) or (3) converted to a decimal string, which is honestly the same as (1) so ignore this case
*/ */
fun tryLookup(id: String): Card? { fun tryLookup(id: String): Card? {
// First remove the colons and spaces
val idm = id.replace(":", "").replace(" ", "")
// Check case (1) and (4) // Check case (1) and (4)
cardRepo.findByLuid(id)?.getOrNull()?.let { return it } cardRepo.findByLuid(idm)?.getOrNull()?.let { return it }
cardRepo.findByLuid(id.padStart(20, '0'))?.getOrNull()?.let { return it } cardRepo.findByLuid(idm.padStart(20, '0'))?.getOrNull()?.let { return it }
// Check case (2) // Check case (2)
// First remove the colons
val idm = id.replace(":", "")
// Then convert to long, left pad zeros to make 20 digits, and look up // Then convert to long, left pad zeros to make 20 digits, and look up
idm.toLongOrNull(16)?.let { idmLong -> idm.toLongOrNull(16)?.let { idmLong ->
cardRepo.findByLuid("%020d".format(idmLong))?.getOrNull()?.let { return it } cardRepo.findByLuid("%020d".format(idmLong))?.getOrNull()?.let { return it }