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 406f3ad..f5eb5db 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 @@ -12,6 +12,7 @@ import com.willfp.ecobosses.defence.MountHandler import com.willfp.ecobosses.defence.PickupHandler import com.willfp.ecobosses.integrations.levelledmobs.IntegrationLevelledMobs import com.willfp.ecobosses.lifecycle.CompatibilityListeners +import com.willfp.ecobosses.lifecycle.DeathListeners import com.willfp.ecobosses.lifecycle.LifecycleHandlers import com.willfp.ecobosses.spawn.AutospawnHandler import com.willfp.ecobosses.spawn.SpawnEggHandler @@ -53,7 +54,8 @@ class EcoBossesPlugin : LibReforgePlugin(525, 10635, "&9") { PickupHandler(), ImmunitiesHandler(), CompatibilityListeners(), - SpawnTotemHandler() + SpawnTotemHandler(), + DeathListeners() ) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt index 7f6028b..d9aac00 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt @@ -45,4 +45,8 @@ class LivingEcoBoss( boss.markDead(uuid) } + + override fun toString(): String { + return "LivingEcoBoss{boss=${boss}, uuid=${uuid}}" + } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt index cae6499..6e785c7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt @@ -16,10 +16,11 @@ class DeathListeners : Listener { fun handle(event: EntityDeathByEntityEvent) { val boss = Bosses[event.victim] ?: return - boss.remove() - val deathEvent = BossKillEvent(boss, event.killer.tryAsPlayer(), event.deathEvent) Bukkit.getPluginManager().callEvent(deathEvent) + + boss.remove() + } @EventHandler( @@ -28,10 +29,10 @@ class DeathListeners : Listener { fun handle(event: EntityDeathEvent) { val boss = Bosses[event.entity] ?: return - boss.remove() - val deathEvent = BossKillEvent(boss, null, event) Bukkit.getPluginManager().callEvent(deathEvent) + + boss.remove() } @EventHandler(