diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt index 23ce24d..1fdb360 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EcoBoss.kt @@ -327,9 +327,9 @@ class EcoBoss( for ((index, damager) in entity.topDamagers.withIndex()) { val rewards = commandRewards[index] ?: continue - val player = Bukkit.getPlayer(damager.uuid) ?: continue + val damagerPlayer = Bukkit.getPlayer(damager.uuid) ?: continue for (reward in rewards) { - reward.reward(player) + reward.reward(damagerPlayer) } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/defence/PickupHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/defence/PickupHandler.kt index 9520155..73a82b0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/defence/PickupHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/defence/PickupHandler.kt @@ -12,7 +12,7 @@ class PickupHandler : Listener { ) fun handle(event: EntityPickupItemEvent) { val entity = event.entity as? LivingEntity ?: return - val boss = Bosses[entity]?.boss ?: return + Bosses[entity]?.boss ?: return event.isCancelled = true }