diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt index 0659329..f4b5f64 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt @@ -24,6 +24,7 @@ import com.willfp.ecomponent.CaptiveItem import com.willfp.ecomponent.menuStateVar import com.willfp.ecomponent.setSlot import com.willfp.reforges.reforges.PriceMultipliers +import com.willfp.reforges.reforges.PriceMultipliers.reforgePriceMultiplier import com.willfp.reforges.reforges.Reforge import com.willfp.reforges.reforges.ReforgeTarget import com.willfp.reforges.reforges.ReforgeTargets @@ -266,7 +267,7 @@ object ReforgeGUI { .pow(reforges.toDouble()) } - multiplier *= PriceMultipliers.getForPlayer(player).multiplier + multiplier *= player.reforgePriceMultiplier status.price.setMultiplier(player, multiplier) } @@ -284,7 +285,7 @@ object ReforgeGUI { val status = if (item.isEmpty) { ReforgeStatus.NO_ITEM } else { - targets.addAll(ReforgeTargets.getForItem(item!!)) + targets.addAll(ReforgeTargets.getForItem(item)) if (targets.isEmpty()) { ReforgeStatus.INVALID_ITEM } else { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt index 2654b3e..dbd602f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/PriceMultipliers.kt @@ -34,6 +34,10 @@ object PriceMultipliers { return current } + /** The price multiplier from permissions. */ + val Player.reforgePriceMultiplier: Double + get() = getForPlayer(this).multiplier + /** * List of all registered multipliers. * diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt index f11a789..101b77f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/ReforgeTargets.kt @@ -33,7 +33,11 @@ object ReforgeTargets { * @return The target. */ @JvmStatic - fun getForItem(item: ItemStack): List { + fun getForItem(item: ItemStack?): List { + if (item == null) { + return emptyList() + } + return registered.values .filter { !it.id.equals("all", ignoreCase = true) } .filter { it.matches(item) }