Repo-Mirror/EcoCrates
9
0
Fork 0
Code Issues Releases Activity

Fixed reward NPE with custom items

Browse Source
This commit is contained in:
Auxilor
2022-03-27 14:01:45 +01:00
parent 3c8b706f45
commit c0ef65e656
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/reward/Reward.kt
View File

@@ -11,15 +11,17 @@ import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.builder.ItemStackBuilder
import com.willfp.eco.core.placeholder.PlayerPlaceholder
import com.willfp.eco.core.recipe.parts.EmptyTestableItem
import com.willfp.eco.core.recipe.parts.MaterialTestableItem
import com.willfp.eco.util.formatEco
import com.willfp.eco.util.toNiceString
import com.willfp.ecocrates.crate.Crate
import com.willfp.ecocrates.crate.PermissionMultipliers
import org.bukkit.Bukkit
import org.bukkit.Material
import org.bukkit.OfflinePlayer
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import java.util.Objects
import java.util.*
class Reward(
private val plugin: EcoPlugin,
@@ -46,8 +48,10 @@ class Reward(
private val canPermissionMultiply = config.getBool("weight.permission-multipliers")
private val baseDisplay = ItemStackBuilder(Items.lookup(config.getString("display.item")))
.setDisplayName(config.getString("display.name"))
private val baseDisplay = ItemStackBuilder(
Items.lookup(config.getString("display.item"))
.let { if (it is EmptyTestableItem) MaterialTestableItem(Material.STONE) else it }
).setDisplayName(config.getString("display.name"))
.build()
fun getDisplay(player: Player, crate: Crate): ItemStack {