From de2b8f7526b5288f58c072df68439aa66559426d Mon Sep 17 00:00:00 2001 From: grzybeek Date: Thu, 21 Jul 2022 17:02:42 +0200 Subject: [PATCH 1/2] small chunkticker code cleanup --- .../main/kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt | 2 -- .../src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) 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 262da08..a895f53 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 @@ -46,8 +46,6 @@ class LivingEcoBoss( ticker.cancel() entity.remove() tickers.forEach { it.onDeath(this, currentTick) } - forceLoadedChunks.forEach { it.isForceLoaded = false } - forceLoadedChunks.clear() boss.markDead(mob.uniqueId) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt index d2c6325..d27df52 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/ChunkTicker.kt @@ -18,4 +18,9 @@ class ChunkTicker : BossTicker { currentChunk.isForceLoaded = true boss.forceLoadedChunks.add(currentChunk) } + + override fun onDeath(boss: LivingEcoBoss, tick: Int) { + boss.forceLoadedChunks.forEach { it.isForceLoaded = false } + boss.forceLoadedChunks.clear() + } } From 05cf399e77f419ecfd0b8adb25afa62e0a11f1d4 Mon Sep 17 00:00:00 2001 From: grzybeek Date: Thu, 21 Jul 2022 17:07:37 +0200 Subject: [PATCH 2/2] remove useless mob getter --- .../kotlin/com/willfp/ecobosses/bosses/LivingEcoBoss.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 a895f53..aab4793 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 @@ -7,7 +7,7 @@ import org.bukkit.entity.Mob class LivingEcoBoss( plugin: EcoPlugin, - private val mob: Mob, + val entity: Mob, val boss: EcoBoss, private val tickers: Set ) { @@ -17,9 +17,6 @@ class LivingEcoBoss( } }.apply { runTaskTimer(1, 1) } - val entity: Mob - get() = mob - val chunk: Chunk get() = entity.location.chunk @@ -47,10 +44,10 @@ class LivingEcoBoss( entity.remove() tickers.forEach { it.onDeath(this, currentTick) } - boss.markDead(mob.uniqueId) + boss.markDead(entity.uniqueId) } override fun toString(): String { - return "LivingEcoBoss{boss=${boss}, uuid=${mob.uniqueId}}" + return "LivingEcoBoss{boss=${boss}, uuid=${entity.uniqueId}}" } }