Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2026-01-04 15:41:36 +00:00
Code Issues Releases 1 Activity

PR fixes

Browse Source
This commit is contained in:
Auxilor
2022-10-09 14:55:38 +01:00
parent 85c4f5c010
commit 95c4a92946
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/effects/Effect.kt
View File

@@ -10,14 +10,18 @@ import com.willfp.ecoskills.EcoSkillsPlugin
import com.willfp.ecoskills.SkillObject
import com.willfp.ecoskills.getEffectLevel
import com.willfp.libreforge.conditions.Conditions
import com.willfp.libreforge.conditions.ConfiguredCondition
import com.willfp.libreforge.conditions.isMet
import org.bukkit.NamespacedKey
import org.bukkit.entity.Player
import org.bukkit.event.Listener
import java.util.*
import java.util.UUID
abstract class Effect(
id: String
) : SkillObject(id), Listener {
private val conditions = mutableSetOf<ConfiguredCondition>()
constructor(
id: String,
forceConfig: Config
@@ -45,6 +49,11 @@ abstract class Effect(
config = loadConfig()
}
conditions += Conditions.compile(
this.config.getSubsections("conditions"),
"Effect ID $id"
)
Effects.registerNewEffect(this)
update()
}
@@ -78,7 +87,6 @@ abstract class Effect(
}
protected fun checkConditions(player: Player): Boolean {
return this.config.getSubsections("conditions").map { Conditions.compile(it,
"Condition for effect: ${this.key.key}") }.all { it?.isMet(player)?: true }
return conditions.isMet(player)
}
}
}