Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added optional 'amount' (minimum entities matched) arg to 'near_entity'. #152

Merged
merged 1 commit into from
May 11, 2024
Merged

Added optional 'amount' (minimum entities matched) arg to 'near_entity'. #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/kotlin/com/willfp/libreforge/conditions/impl/ConditionNearEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@ object ConditionNearEntity : Condition<Collection<TestableEntity>>("near_entity"
val location = dispatcher.location ?: return false
val radius = config.getDoubleFromExpression("radius", dispatcher.get())

return location.world.getNearbyEntities(location, radius, radius, radius).any {
// Default to require there to be at least 1 entity if no minimum is defined by the user.
val nearbyEntityMinimumRequirement = config.getIntOrNull("amount") ?: 1
val nearbyEntitiesWhichMatchCriteria = location.world.getNearbyEntities(location, radius, radius, radius).count {
compileData.any { test -> test.matches(it) }
}

return nearbyEntitiesWhichMatchCriteria >= nearbyEntityMinimumRequirement
}

override fun makeCompileData(config: Config, context: ViolationContext): Collection<TestableEntity> {
Expand Down