Updated to libreforge 4.44.0x

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/handler/SpawnTotemHandler.kt

@@ -3,6 +3,7 @@ package com.willfp.ecomobs.handler
 import com.willfp.ecomobs.mob.EcoMobs
 import com.willfp.ecomobs.mob.SpawnReason
 import com.willfp.ecomobs.mob.SpawnTotem
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.block.Block
 import org.bukkit.event.EventHandler
@@ -38,7 +39,7 @@ class SpawnTotemHandler : Listener {
                 if (!options.conditions.areMetAndTrigger(
                         TriggerData(
                             player = player
-                        ).dispatch(player)
+                        ).dispatch(player.toDispatcher())
                     )
                 ) {
                     continue

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/MobEvent.kt

@@ -15,13 +15,4 @@ abstract class MobEvent(
     override fun onRegister() {
         plugin.eventManager.registerListener(this)
     }
-
-    /*
-    libreforge effects require a player to be passed in, so we just use an arbitrary player.
-    This means that if there are no players online, then certain events will not fire - but this
-    shouldn't cause much of an issue.
-     */
-    protected fun getArbitraryPlayer(): Player? {
-        return Bukkit.getOnlinePlayers().firstOrNull()
-    }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventDamagePlayer.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.mob.event.impl
 
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.entity.Mob
 import org.bukkit.entity.Player
@@ -23,6 +24,6 @@ object MobEventDamagePlayer : MobEvent("damage_player") {
             event = event
         )
 
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(player.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventDeath.kt

@@ -3,6 +3,7 @@ package com.willfp.ecomobs.mob.event.impl
 import com.willfp.ecomobs.event.EcoMobDeathEvent
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.Bukkit
 import org.bukkit.entity.Mob
@@ -27,11 +28,9 @@ object MobEventDeath : MobEvent("death") {
         // Clear default drops
         event.drops.clear()
 
-        val player = getArbitraryPlayer() ?: return
-
         Bukkit.getPluginManager().callEvent(EcoMobDeathEvent(living))
 
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(bukkitMob.toDispatcher()))
         living.kill(null)
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventDespawn.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.mob.event.impl
 
 import com.willfp.ecomobs.event.EcoMobDespawnEvent
 import com.willfp.ecomobs.mob.event.MobEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.event.EventHandler
 
@@ -16,8 +17,6 @@ object MobEventDespawn: MobEvent("despawn") {
             event = event
         )
 
-        val player = getArbitraryPlayer() ?: return
-
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(living.entity.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventInteract.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.mob.event.impl
 
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.entity.Mob
 import org.bukkit.event.EventHandler
@@ -22,6 +23,6 @@ object MobEventInteract: MobEvent("interact") {
             event = event
         )
 
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(bukkitMob.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventKill.kt

@@ -5,6 +5,7 @@ import com.willfp.eco.util.tryAsPlayer
 import com.willfp.ecomobs.event.EcoMobKillEvent
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.Bukkit
 import org.bukkit.entity.Mob
@@ -31,7 +32,7 @@ object MobEventKill : MobEvent("kill") {
 
         Bukkit.getPluginManager().callEvent(EcoMobKillEvent(living, player))
 
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(player.toDispatcher()))
         living.kill(player)
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventKillPlayer.kt

@@ -3,6 +3,7 @@ package com.willfp.ecomobs.mob.event.impl
 import com.willfp.eco.core.events.EntityDeathByEntityEvent
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.entity.Mob
 import org.bukkit.entity.Player
@@ -23,6 +24,6 @@ object MobEventKillPlayer : MobEvent("kill_player") {
             event = event
         )
 
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(player.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventMeleeAttack.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.mob.event.impl
 
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.entity.Mob
 import org.bukkit.entity.Player
@@ -14,16 +15,16 @@ object MobEventMeleeAttack : MobEvent("melee_attack") {
         val bukkitMob = event.entity as? Mob ?: return
         val ecoMob = bukkitMob.ecoMob ?: return
         val living = ecoMob.getLivingMob(bukkitMob) ?: return
-        val player = event.damager as? Player ?: return
+        val damager = event.damager
 
         val data = TriggerData(
-            player = player,
+            player = damager as? Player,
             victim = bukkitMob,
             location = bukkitMob.location,
             event = event
         )
 
-        living.handleEvent(this, data.dispatch(player))
-        living.handleEvent(MobEventAnyAttack, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(damager.toDispatcher()))
+        living.handleEvent(MobEventAnyAttack, data.dispatch(damager.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventRangedAttack.kt

@@ -3,6 +3,7 @@ package com.willfp.ecomobs.mob.event.impl
 import com.willfp.eco.util.tryAsPlayer
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.entity.Mob
 import org.bukkit.entity.Player
@@ -30,7 +31,7 @@ object MobEventRangedAttack : MobEvent("ranged_attack") {
             event = event
         )
 
-        living.handleEvent(this, data.dispatch(player))
-        living.handleEvent(MobEventAnyAttack, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(player.toDispatcher()))
+        living.handleEvent(MobEventAnyAttack, data.dispatch(player.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventSpawn.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.mob.event.impl
 
 import com.willfp.ecomobs.event.EcoMobSpawnEvent
 import com.willfp.ecomobs.mob.event.MobEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.event.EventHandler
 
@@ -16,8 +17,6 @@ object MobEventSpawn: MobEvent("spawn") {
             event = event
         )
 
-        val player = getArbitraryPlayer() ?: return
-
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(living.entity.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/event/impl/MobEventTakeDamage.kt

@@ -2,6 +2,7 @@ package com.willfp.ecomobs.mob.event.impl
 
 import com.willfp.ecomobs.mob.event.MobEvent
 import com.willfp.ecomobs.mob.impl.ecoMob
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.Bukkit
 import org.bukkit.entity.Mob
@@ -23,8 +24,6 @@ object MobEventTakeDamage : MobEvent("take_damage") {
             event = event
         )
 
-        val player = Bukkit.getOnlinePlayers().firstOrNull() ?: return
-
-        living.handleEvent(this, data.dispatch(player))
+        living.handleEvent(this, data.dispatch(bukkitMob.toDispatcher()))
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/mob/options/SpawnEgg.kt

@@ -11,6 +11,7 @@ import com.willfp.ecomobs.mob.EcoMobs
 import com.willfp.ecomobs.mob.LivingMob
 import com.willfp.ecomobs.mob.SpawnReason
 import com.willfp.libreforge.conditions.ConditionList
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.Location
 import org.bukkit.entity.Player
@@ -27,7 +28,7 @@ class SpawnEgg internal constructor(
             val canSpawn = conditions.areMetAndTrigger(
                 TriggerData(
                     player = player
-                ).dispatch(player)
+                ).dispatch(player.toDispatcher())
             )
 
             if (!canSpawn) {

gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
-libreforge-version=4.42.0
+libreforge-version=4.44.0
 version=10.0.0-b1