Cleaned up spawner_entity

Auxilor · Jul 25, 2024 · cad7471 · cad7471
1 parent 2ec6e8f
commit cad7471
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/filters/impl/FilterSpawnerEntity.kt b/core/common/src/main/kotlin/com/willfp/libreforge/filters/impl/FilterSpawnerEntity.kt
@@ -8,21 +8,16 @@ import com.willfp.libreforge.triggers.TriggerData
 import org.bukkit.block.CreatureSpawner
 
 object FilterSpawnerEntity : Filter<NoCompileData, Collection<String>>("spawner_entity") {
-
     override fun getValue(config: Config, data: TriggerData?, key: String): Collection<String> {
         return config.getStrings(key)
     }
 
     override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
-        val block = data.block ?: return false
-
-        if (block.state is CreatureSpawner) {
-            val spawner = block.state as CreatureSpawner
-            val spawnerEntityType = spawner.spawnedType?.name ?: "null"
+        val block = data.block ?: return true
+        val state = block.state as? CreatureSpawner ?: return false
 
-            return value.containsIgnoreCase(spawnerEntityType)
-        }
+        val spawnerEntityType = state.spawnedType?.name ?: "null"
 
-        return false
+        return value.containsIgnoreCase(spawnerEntityType)
     }
-}
+}