aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin
diff options
context:
space:
mode:
authorLulonaut <lulonaut@lulonaut.tech>2024-02-13 13:37:20 +0100
committerGitHub <noreply@github.com>2024-02-13 23:37:20 +1100
commit028c8c6b0620b1c7f4f71f7d7991de42130f9d6e (patch)
treeb8990a5dd98c6282493d00fc3109bb0dd7bcb34b /src/main/kotlin
parent0a12055a788865ab37483695e2f3c18175b79ae0 (diff)
downloadNotEnoughUpdates-028c8c6b0620b1c7f4f71f7d7991de42130f9d6e.tar.gz
NotEnoughUpdates-028c8c6b0620b1c7f4f71f7d7991de42130f9d6e.tar.bz2
NotEnoughUpdates-028c8c6b0620b1c7f4f71f7d7991de42130f9d6e.zip
Fix crash when parsing bestiary/trophy fish data (#1018)
Diffstat (limited to 'src/main/kotlin')
-rw-r--r--src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/bestiary/BestiaryData.kt9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/bestiary/BestiaryData.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/bestiary/BestiaryData.kt
index ef8468ac..cf11b355 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/bestiary/BestiaryData.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/profileviewer/bestiary/BestiaryData.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2023 NotEnoughUpdates contributors
+ * Copyright (C) 2023-2024 NotEnoughUpdates contributors
*
* This file is part of NotEnoughUpdates.
*
@@ -124,11 +124,14 @@ object BestiaryData {
val apiDeaths = profileInfo.getAsJsonObject("bestiary").getAsJsonObject("deaths") ?: return mutableListOf()
val killsMap: HashMap<String, Int> = HashMap()
for (entry in apiKills.entrySet()) {
- killsMap[entry.key] = entry.value.asInt
+ if (entry.key == "last_killed_mob") {
+ continue
+ }
+ killsMap[entry.key] = entry.value.asString.toIntOrNull() ?: -1
}
val deathsMap: HashMap<String, Int> = HashMap()
for (entry in apiDeaths.entrySet()) {
- deathsMap[entry.key] = entry.value.asInt
+ deathsMap[entry.key] = entry.value.asString.toIntOrNull() ?: -1
}
for (categoryId in categoriesToParse) {