diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt index 37648d6..929cc10 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt @@ -30,7 +30,9 @@ import com.willfp.libreforge.loader.LibreforgePlugin import com.willfp.libreforge.loader.configs.ConfigCategory import com.willfp.libreforge.mutators.Mutators import com.willfp.libreforge.registerHolderProvider +import com.willfp.libreforge.registerSpecificHolderProvider import com.willfp.libreforge.triggers.Triggers +import org.bukkit.entity.Player import org.bukkit.event.Listener class EcoBossesPlugin : LibreforgePlugin() { @@ -52,7 +54,9 @@ class EcoBossesPlugin : LibreforgePlugin() { } override fun handleEnable() { - registerHolderProvider { it.bossHolders } + registerSpecificHolderProvider { + it.bossHolders + } } override fun handleReload() { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt index 64a23b9..3be3cb7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt @@ -6,6 +6,7 @@ import com.willfp.eco.core.display.DisplayModule import com.willfp.eco.core.display.DisplayPriority import com.willfp.eco.core.fast.fast import com.willfp.libreforge.SimpleProvidedHolder +import com.willfp.libreforge.toDispatcher import org.bukkit.entity.Player import org.bukkit.inventory.ItemStack @@ -27,7 +28,7 @@ class EggDisplay( val egg = itemStack.bossEgg ?: return val lines = egg.spawnConditions - .filterNot { it.isMet(player, SimpleProvidedHolder(egg)) } + .filterNot { it.isMet(player.toDispatcher(), SimpleProvidedHolder(egg)) } .map { it.notMetLines.map { line -> Display.PREFIX + line } } .flatten() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/EffectBossDropChanceMultiplier.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/EffectBossDropChanceMultiplier.kt index cc74d31..c4edd0b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/EffectBossDropChanceMultiplier.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/EffectBossDropChanceMultiplier.kt @@ -4,6 +4,7 @@ import com.willfp.ecobosses.bosses.Bosses import com.willfp.ecobosses.bosses.EcoBoss import com.willfp.ecobosses.events.BossTryDropItemEvent import com.willfp.libreforge.effects.templates.MultiMultiplierEffect +import com.willfp.libreforge.toDispatcher import org.bukkit.event.EventHandler object EffectBossDropChanceMultiplier : MultiMultiplierEffect("boss_drop_chance_multiplier") { @@ -21,7 +22,7 @@ object EffectBossDropChanceMultiplier : MultiMultiplierEffect("boss_dro fun handle(event: BossTryDropItemEvent) { val player = event.player ?: return - val multiplier = getMultiplier(player, event.boss) + val multiplier = getMultiplier(player.toDispatcher(), event.boss) event.chance *= multiplier } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerKillBoss.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerKillBoss.kt index c030335..2652827 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerKillBoss.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerKillBoss.kt @@ -1,6 +1,7 @@ package com.willfp.ecobosses.libreforge import com.willfp.ecobosses.events.BossKillEvent +import com.willfp.libreforge.toDispatcher import com.willfp.libreforge.triggers.Trigger import com.willfp.libreforge.triggers.TriggerData import com.willfp.libreforge.triggers.TriggerParameter @@ -20,7 +21,7 @@ object TriggerKillBoss : Trigger("kill_boss") { val entity = event.boss.entity this.dispatch( - killer, + killer.toDispatcher(), TriggerData( player = killer, victim = entity, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerSpawnBoss.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerSpawnBoss.kt index 3f33ae0..406a629 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerSpawnBoss.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/libreforge/TriggerSpawnBoss.kt @@ -1,6 +1,7 @@ package com.willfp.ecobosses.libreforge import com.willfp.ecobosses.events.BossSpawnEvent +import com.willfp.libreforge.toDispatcher import com.willfp.libreforge.triggers.Trigger import com.willfp.libreforge.triggers.TriggerData import com.willfp.libreforge.triggers.TriggerParameter @@ -18,7 +19,7 @@ object TriggerSpawnBoss : Trigger("spawn_boss") { val location = event.location this.dispatch( - player, + player.toDispatcher(), TriggerData( player = player, location = location diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt index c698a6b..6526fce 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt @@ -4,6 +4,7 @@ import com.willfp.ecobosses.EcoBossesPlugin import com.willfp.ecobosses.bosses.bossEgg import com.willfp.ecobosses.events.BossSpawnEvent import com.willfp.libreforge.SimpleProvidedHolder +import com.willfp.libreforge.toDispatcher import org.bukkit.Bukkit import org.bukkit.Location import org.bukkit.block.Container @@ -79,7 +80,7 @@ class SpawnEggHandler( } if (player != null) { - if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) { + if (!boss.spawnConditions.areMet(player.toDispatcher(), SimpleProvidedHolder(boss))) { return false } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt index b89a906..511e2a5 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt @@ -5,6 +5,7 @@ import com.willfp.ecobosses.bosses.Bosses import com.willfp.ecobosses.events.BossSpawnEvent import com.willfp.ecobosses.util.SpawnTotem import com.willfp.libreforge.SimpleProvidedHolder +import com.willfp.libreforge.toDispatcher import org.bukkit.Bukkit import org.bukkit.Material import org.bukkit.block.Block @@ -55,7 +56,7 @@ class SpawnTotemHandler : Listener { val player = event.player - if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) { + if (!boss.spawnConditions.areMet(player.toDispatcher(), SimpleProvidedHolder(boss))) { return } diff --git a/gradle.properties b/gradle.properties index c6986e4..12899b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Sun Nov 19 14:14:11 GMT 2023 +#Tue Nov 21 22:41:27 GMT 2023 kotlin.code.style=official -libreforge-version=4.43.1 -version=9.42.1 +libreforge-version=4.44.0 +version=9.43.0