From 1f7866eba4e6c0148dbaf0ab7e7fb9640306f9d2 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 15 Oct 2021 09:41:32 +0100 Subject: [PATCH] Fixed reward_kill after much pain --- .../reforges/effects/effects/EffectRewardBlockBreak.kt | 2 +- .../reforges/effects/effects/EffectRewardKill.kt | 10 ++++------ .../willfp/reforges/reforges/util/WatcherTriggers.kt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardBlockBreak.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardBlockBreak.kt index 8cdc4f9..b376d4a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardBlockBreak.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardBlockBreak.kt @@ -7,7 +7,7 @@ import org.bukkit.block.Block import org.bukkit.entity.Player import org.bukkit.event.block.BlockBreakEvent -class EffectRewardBlockBreak : Effect("reward_kill") { +class EffectRewardBlockBreak : Effect("reward_block_break") { override fun onBlockBreak( player: Player, block: Block, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardKill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardKill.kt index 31a77fa..a6b6a38 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardKill.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/effects/effects/EffectRewardKill.kt @@ -8,12 +8,10 @@ import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player class EffectRewardKill : Effect("reward_kill") { - override fun onKill( - killer: Player, - victim: LivingEntity, - event: EntityDeathByEntityEvent, - config: JSONConfig - ) { + override fun onKill(killer: Player, + victim: LivingEntity, + event: EntityDeathByEntityEvent, + config: JSONConfig) { if (EconomyHandler.isEnabled()) { EconomyHandler.getInstance().depositPlayer(killer, config.getDouble("amount")) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/WatcherTriggers.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/WatcherTriggers.kt index b0531c1..07c4c45 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/WatcherTriggers.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/util/WatcherTriggers.kt @@ -222,7 +222,7 @@ class WatcherTriggers( if (NumberUtils.randFloat(0.0, 100.0) > config.getDoubleOrNull("chance") ?: 100.0) { continue } - effect.onKill(killer, victim, event, config) + (effect as Watcher).onKill(killer, victim, event, config) } } }