libreforge-updater

small chunkticker code cleanup

build.gradle

@@ -63,7 +63,7 @@ allprojects {
 
     dependencies {
         compileOnly 'com.willfp:eco:6.35.1'
-        implementation 'com.willfp:libreforge:3.76.1'
+        implementation 'com.willfp:libreforge:3.83.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'

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<BossTicker>
 ) {
@@ -17,9 +17,6 @@ class LivingEcoBoss(
         }
     }.apply { runTaskTimer(1, 1) }
 
-    val entity: Mob
-        get() = mob
-
     val chunk: Chunk
         get() = entity.location.chunk
 
@@ -46,13 +43,11 @@ class LivingEcoBoss(
         ticker.cancel()
         entity.remove()
         tickers.forEach { it.onDeath(this, currentTick) }
-        forceLoadedChunks.forEach { it.isForceLoaded = false }
-        forceLoadedChunks.clear()
 
-        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}}"
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt

@@ -6,6 +6,7 @@ import com.willfp.ecobosses.bosses.Bosses
 import com.willfp.ecobosses.events.BossKillEvent
 import org.bukkit.Bukkit
 import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDeathEvent
 
@@ -25,7 +26,8 @@ class DeathListeners : Listener {
     }
 
     @EventHandler(
-        ignoreCancelled = true
+        ignoreCancelled = true,
+        priority = EventPriority.HIGHEST
     )
     fun handle(event: EntityDeathEvent) {
         val boss = Bosses[event.entity] ?: return

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()
+    }
 }

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Fri Jul 22 14:20:45 BST 2022
-version=8.61.1
+#Sun Aug 14 17:30:33 CEST 2022
+version=8.68.0
 plugin-name=EcoBosses