Removed Living Cave Defence Blocks when the mob dies

1 files changed, 17 insertions, 5 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
index 18304c25e..5a23ee650 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.rift.area.livingcave
 
+import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.ReceiveParticleEvent
 import at.hannibal2.skyhanni.events.ServerBlockChangeEvent
 import at.hannibal2.skyhanni.events.withAlpha
@@ -28,6 +29,15 @@ class LivingCaveDefenseBlocks {
 
     class DefenseBlock(val entity: EntityOtherPlayerMP, val location: LorenzVec, var hidden: Boolean = false)
 
+
+    @SubscribeEvent
+    fun onTick(event: LorenzTickEvent) {
+        if (!isEnabled()) return
+        if (event.isMod(20)) {
+            staticBlocks = staticBlocks.editCopy { removeIf { it.entity.isDead } }
+        }
+    }
+
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
         if (!isEnabled()) return
@@ -68,10 +78,11 @@ class LivingCaveDefenseBlocks {
             if (entity == null) {
                 // read new entity data
                 val compareLocation = event.location.add(-0.5, -1.5, -0.5)
-                entity = Minecraft.getMinecraft().theWorld.getEntitiesNearby<EntityOtherPlayerMP>(compareLocation, 2.0)
-                    .filter { isCorrectMob(it.name) }
-                    .filter { !it.isAtFullHealth() }
-                    .minByOrNull { it.distanceTo(compareLocation) }
+                entity =
+                    Minecraft.getMinecraft().theWorld.getEntitiesNearby<EntityOtherPlayerMP>(compareLocation, 2.0)
+                        .filter { isCorrectMob(it.name) }
+                        .filter { !it.isAtFullHealth() }
+                        .minByOrNull { it.distanceTo(compareLocation) }
             }
 
             val defenseBlock = entity?.let { DefenseBlock(it, location) } ?: return
@@ -122,7 +133,8 @@ class LivingCaveDefenseBlocks {
     }
 
     private fun getNearestMovingDefenseBlock(location: LorenzVec) =
-        movingBlocks.keys.filter { it.location.distance(location) < 15 }.minByOrNull { it.location.distance(location) }
+        movingBlocks.keys.filter { it.location.distance(location) < 15 }
+            .minByOrNull { it.location.distance(location) }
 
     private fun getNearestStaticDefenseBlock(location: LorenzVec) =
         staticBlocks.filter { it.location.distance(location) < 15 }.minByOrNull { it.location.distance(location) }