Skip to content

Commit 14a25cb

Browse files
committed
reverted back to sheep_color to avoid confusion
1 parent 0bc9989 commit 14a25cb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/common/src/main/kotlin/com/willfp/libreforge/filters/Filters.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ object Filters : Registry<Filter<*, *>>() {
9696
register(FilterSpawnerEntity)
9797
register(FilterSwept)
9898
register(FilterHoneyLevelFull)
99-
register(FilterEntityColor)
99+
register(FilterSheepColor)
100100
}
101101
}

core/common/src/main/kotlin/com/willfp/libreforge/filters/impl/FilterEntityColor.kt core/common/src/main/kotlin/com/willfp/libreforge/filters/impl/FilterSheepColor.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import com.willfp.libreforge.filters.Filter
66
import com.willfp.libreforge.triggers.TriggerData
77
import org.bukkit.entity.Sheep
88

9-
object FilterEntityColor : Filter<NoCompileData, Collection<String>>("entity_color") {
9+
object FilterSheepColor : Filter<NoCompileData, Collection<String>>("sheep_color") {
1010
override fun getValue(config: Config, data: TriggerData?, key: String): Collection<String> {
1111
return config.getStrings(key)
1212
}
1313

1414
override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
1515
val entity = data.victim as? Sheep ?: return false
16-
val entityColor = entity.color?.name
16+
val sheepColor = entity.color?.name
1717

18-
return value.any { it.equals(entityColor, ignoreCase = true) }
18+
return value.any { it.equals(sheepColor, ignoreCase = true) }
1919
}
2020
}

0 commit comments

Comments
 (0)