diff options
author | Dico <dico.karssiens@gmail.com> | 2018-09-24 09:01:04 +0100 |
---|---|---|
committer | Dico <dico.karssiens@gmail.com> | 2018-09-24 09:01:04 +0100 |
commit | f2d88b3c54c83f1b826ebb3e483c599b64ad39bf (patch) | |
tree | 798e717858a4f88dc50a4fa3c1cb464d0ecdc083 /src/main/kotlin/io/dico/parcels2/Privilege.kt | |
parent | 59e0cdda6db34a018506c0712302b11329e8c191 (diff) |
Remove privilegesOfStar exposure
Diffstat (limited to 'src/main/kotlin/io/dico/parcels2/Privilege.kt')
-rw-r--r-- | src/main/kotlin/io/dico/parcels2/Privilege.kt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/Privilege.kt b/src/main/kotlin/io/dico/parcels2/Privilege.kt index 0eebe25..040e5f5 100644 --- a/src/main/kotlin/io/dico/parcels2/Privilege.kt +++ b/src/main/kotlin/io/dico/parcels2/Privilege.kt @@ -64,8 +64,7 @@ typealias PrivilegeMap = Map<PrivilegeKey, Privilege> fun MutablePrivilegeMap(): MutablePrivilegeMap = hashMapOf() interface PrivilegesMinimal { - val map: PrivilegeMap - var privilegeOfStar: Privilege + val privilegeMap: PrivilegeMap fun getStoredPrivilege(key: PrivilegeKey): Privilege fun setStoredPrivilege(key: PrivilegeKey, privilege: Privilege): Boolean @@ -120,13 +119,12 @@ enum class PrivilegeChangeResult { val OfflinePlayer.privilegeKey: PrivilegeKey inline get() = PlayerProfile.nameless(this) -open class PrivilegesHolder(override var map: MutablePrivilegeMap = MutablePrivilegeMap()) : PrivilegesMinimal { - override var privilegeOfStar: Privilege = DEFAULT - set(value) = run { field = value.requireNonTransient() } +open class PrivilegesHolder(override var privilegeMap: MutablePrivilegeMap = MutablePrivilegeMap()) : PrivilegesMinimal { + private var privilegeOfStar: Privilege = DEFAULT override fun getStoredPrivilege(key: PrivilegeKey) = if (key.isStar) privilegeOfStar - else map.getOrDefault(key, privilegeOfStar) + else privilegeMap.getOrDefault(key, privilegeOfStar) override fun setStoredPrivilege(key: PrivilegeKey, privilege: Privilege): Boolean { privilege.requireNonTransient() @@ -137,8 +135,8 @@ open class PrivilegesHolder(override var map: MutablePrivilegeMap = MutablePrivi return true } - return if (privilege == DEFAULT) map.remove(key) != null - else map.put(key, privilege) != privilege + return if (privilege == DEFAULT) privilegeMap.remove(key) != null + else privilegeMap.put(key, privilege) != privilege } } |