From 88e82ad9c86a4a5720a1088ae0791a4b6209d645 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 21 Apr 2024 23:37:51 +0700 Subject: [PATCH] Fix treasure pool levels --- .../kstarbound/defs/item/TreasurePoolDefinition.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt index 8ce21c99..d2ed9fd3 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt @@ -56,17 +56,11 @@ class TreasurePoolDefinition(pieces: List) { visitedPools.put(name, new) try { - for (piece in pieces) { - if (level <= piece.startingLevel) { - return piece.evaluate(random, level, visitedPools) - } + if (pieces.isNotEmpty()) { + return pieces.last { it.startingLevel <= level }.evaluate(random, level, visitedPools) } - if (pieces.last().startingLevel <= level) { - return pieces.last().evaluate(random, level, visitedPools) - } else { - return emptyList() - } + return emptyList() } finally { visitedPools.put(name, visitedPools.getInt(name) - 1) }