From 62e7177b1b61dda33179db6a9282c11678aedb47 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 28 Feb 2022 10:15:52 +0000 Subject: [PATCH] Fixed autospawn --- .../com/willfp/ecobosses/events/BossSpawnEvent.kt | 1 + .../com/willfp/ecobosses/spawn/AutospawnHandler.kt | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt index 4b7300b..349dfa8 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/events/BossSpawnEvent.kt @@ -31,6 +31,7 @@ class BossSpawnEvent( TOTEM, EGG, COMMAND, + AUTOSPAWN, UNKNOWN } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/AutospawnHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/AutospawnHandler.kt index 64fa363..07acf03 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/AutospawnHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/AutospawnHandler.kt @@ -2,6 +2,8 @@ package com.willfp.ecobosses.spawn import com.willfp.eco.core.EcoPlugin import com.willfp.ecobosses.bosses.Bosses +import com.willfp.ecobosses.events.BossSpawnEvent +import org.bukkit.Bukkit object AutospawnHandler { private var tick = 1 @@ -24,7 +26,13 @@ object AutospawnHandler { continue } - boss.spawn(location) + val spawnEvent = BossSpawnEvent(boss, location, BossSpawnEvent.SpawnReason.AUTOSPAWN, null) + + Bukkit.getPluginManager().callEvent(spawnEvent) + + if (!spawnEvent.isCancelled) { + boss.spawn(location) + } } tick++