Fix search radius not being used for cap checks

MineInAbyss · Dec 6, 2023 · 130f311 · 130f311
1 parent c3b007c
commit 130f311
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/.../main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/LocalGroupConditions.kt b/.../main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/LocalGroupConditions.kt
@@ -29,5 +29,5 @@ class CapFull : CheckingListener() {
     val Pointers.spawnInfo by get<SpawnInfo>().on(event)
 
     override fun Pointers.check(): Boolean =
-        (spawnInfo.localTypes[spawnType.prefab] ?: 0) < conf.max
+        spawnInfo.nearbyEntities(spawnType.prefab, conf.radius) < conf.max
 }
diff --git a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/vertical/SpawnInfo.kt b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/vertical/SpawnInfo.kt
@@ -1,18 +1,15 @@
 package com.mineinabyss.mobzy.spawning.vertical
 
-import com.mineinabyss.geary.papermc.tracking.entities.toGeary
 import com.mineinabyss.geary.papermc.tracking.entities.toGearyOrNull
 import com.mineinabyss.geary.prefabs.PrefabKey
 import com.mineinabyss.geary.prefabs.helpers.prefabs
 import com.mineinabyss.idofront.location.down
 import com.mineinabyss.idofront.location.up
-import com.mineinabyss.idofront.typealiases.BukkitEntity
 import com.mineinabyss.mobzy.spawning.SpawnPosition
 import com.mineinabyss.mobzy.spawning.components.SubChunkBlockComposition
 import org.bukkit.ChunkSnapshot
 import org.bukkit.Location
 import org.bukkit.entity.Entity
-import org.bukkit.entity.SpawnCategory
 import kotlin.random.Random
 
 //TODO name could be confused with SpawnRegion
@@ -26,21 +23,16 @@ import kotlin.random.Random
 class SpawnInfo(
     val bottom: Location,
     val top: Location,
-    searchRadius: Double = 400.0,
     chunkSnapshot: ChunkSnapshot? = null,
 ) {
     val chunkSnapshot: ChunkSnapshot by lazy { chunkSnapshot ?: bottom.chunk.chunkSnapshot }
 
     val blockComposition by lazy { SubChunkBlockComposition(this.chunkSnapshot, bottom.blockY) }
 
-    private val searchRadiusSquared = searchRadius * searchRadius
-
-    val localMobs: Collection<BukkitEntity> by lazy {
-        bottom.getNearbyEntities(searchRadiusSquared, searchRadiusSquared, searchRadiusSquared)
-    }
-    val localTypes: Map<PrefabKey?, Int> by lazy { categorizeByType(localMobs) }
-    val localCategories: Map<SpawnCategory, Int> by lazy {
-        localMobs.groupingBy { it.spawnCategory }.eachCount()
+    fun nearbyEntities(key: PrefabKey, radius: Double): Int {
+        return bottom.world.getNearbyEntities(bottom, radius * 2, radius * 2, radius * 2) {
+            it.toGearyOrNull()?.prefabs?.firstOrNull()?.get<PrefabKey>() == key
+        }.count()
     }
 
     //adding one since if the blocks are on the same block, they still have a gap of 1 from top to bottom