From 20d6e423665b99156973bdcfb0324d8a742993d2 Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Sun, 26 Dec 2021 12:58:59 -0500 Subject: [PATCH] Correctly load "Nothing" entries in charm drop tables. --- src/main/kotlin/Editors.kt | 2 +- src/main/kotlin/FileLoader.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/Editors.kt b/src/main/kotlin/Editors.kt index 3209b90..97a9fbc 100644 --- a/src/main/kotlin/Editors.kt +++ b/src/main/kotlin/Editors.kt @@ -21,7 +21,7 @@ enum class Editors(val data: EditorData) { table.ids = dropTable["ids"].toString() parseTable(dropTable["main"] as JSONArray,table,false) parseTable(dropTable["default"] as JSONArray,table,true) - parseTable(dropTable["charm"] as JSONArray,table,false) + parseTable(dropTable["charm"] as JSONArray,table.charmTable,false) table.description = (dropTable["description"] ?: "").toString() TableData.tables.add(table) counter++ diff --git a/src/main/kotlin/FileLoader.kt b/src/main/kotlin/FileLoader.kt index 65ad24c..653edb1 100644 --- a/src/main/kotlin/FileLoader.kt +++ b/src/main/kotlin/FileLoader.kt @@ -36,7 +36,7 @@ object FileLoader{ table.ids = dropTable["ids"].toString() parseTable(dropTable["main"] as JSONArray,table,false) parseTable(dropTable["default"] as JSONArray,table,true) - parseTable(dropTable["charm"] as JSONArray,table,false) + parseTable(dropTable["charm"] as JSONArray,table.charmTable,false) table.description = (dropTable["description"] ?: "").toString() TableData.tables.add(table) counter++ @@ -103,4 +103,4 @@ class NPCDropTable() : WeightBasedTable(){ } return super.add(element) } -} \ No newline at end of file +}