diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt index 4819896..b3fabdc 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/EcoSkillsPlugin.kt @@ -5,6 +5,7 @@ import com.willfp.eco.core.packet.PacketListener import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy import com.willfp.ecoskills.actionbar.ActionBarGamemodeListener import com.willfp.ecoskills.actionbar.ActionBarHandler +import com.willfp.ecoskills.actionbar.HealthScaleDisabler import com.willfp.ecoskills.commands.CommandEcoSkills import com.willfp.ecoskills.commands.CommandSkills import com.willfp.ecoskills.effects.Effects @@ -117,6 +118,7 @@ class EcoSkillsPlugin : LibreforgePlugin() { GainXPDisplay(this), DamageIndicatorListener(this), MagicListener(this), + HealthScaleDisabler(this), ActionBarGamemodeListener, SkillCritListener, StatModifierListener diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt index e98df95..ec10740 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt @@ -17,6 +17,7 @@ import org.bukkit.entity.Player import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.event.player.PlayerGameModeChangeEvent +import org.bukkit.event.player.PlayerJoinEvent import java.util.UUID private const val ACTION_BAR_DURATION = 2700L @@ -148,3 +149,14 @@ class ActionBarHandler( } } } + +class HealthScaleDisabler( + private val plugin: EcoPlugin +) : Listener { + @EventHandler + fun handle(event: PlayerJoinEvent) { + if (!plugin.configYml.getBool("persistent-action-bar.scale-health")) { + event.player.isHealthScaled = false + } + } +}