Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Refactor final occurrences of status -> privilege

Browse Source
This commit is contained in:
Dico
2018-09-24 04:40:32 +01:00
parent 56f9b1dbff
commit 751cc30c6a
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/io/dico/parcels2/PlayerProfile.kt
View File

@@ -185,7 +185,7 @@ interface PlayerProfile {
* An existing player
* A fake player (with only a name)
* An existing player who must have its uuid resolved from the database (after checking against Bukkit OfflinePlayer)
* STAR profile, which matches everyone. This profile is considered a REAL player, because it can have an added status.
* STAR profile, which matches everyone. This profile is considered a REAL player, because it can have a privilege.
*/
class PlayerProfile2 private constructor(uuid: UUID?,
val name: String?,

8
src/main/kotlin/io/dico/parcels2/storage/Backing.kt
View File

@@ -56,18 +56,14 @@ interface Backing {
fun setParcelOwnerSignOutdated(parcel: ParcelId, outdated: Boolean)
fun setLocalPrivilege(parcel: ParcelId, player: PlayerProfile, status: Privilege)
fun setLocalPrivilege(parcel: ParcelId, player: PlayerProfile, privilege: Privilege)
fun setParcelOptionsInteractConfig(parcel: ParcelId, config: InteractableConfiguration)
/*
fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean)
fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean)
*/
fun transmitAllGlobalAddedData(channel: SendChannel<AddedDataPair<PlayerProfile>>)
fun readGlobalPrivileges(owner: PlayerProfile): MutablePrivilegeMap
fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, status: Privilege)
fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, privilege: Privilege)
}

4
src/main/kotlin/io/dico/parcels2/storage/Storage.kt
View File

@@ -59,7 +59,7 @@ interface Storage {
fun readGlobalPrivileges(owner: PlayerProfile): Deferred<MutablePrivilegeMap?>
fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, status: Privilege): Job
fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, privilege: Privilege): Job
fun getChannelToUpdateParcelData(): SendChannel<Pair<ParcelId, ParcelData>>
@@ -108,7 +108,7 @@ class BackedStorage internal constructor(val b: Backing) : Storage, CoroutineSco
override fun readGlobalPrivileges(owner: PlayerProfile): Deferred<MutablePrivilegeMap?> = b.launchFuture { b.readGlobalPrivileges(owner) }
override fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, status: Privilege) = b.launchJob { b.setGlobalPrivilege(owner, player, status) }
override fun setGlobalPrivilege(owner: PlayerProfile, player: PlayerProfile, privilege: Privilege) = b.launchJob { b.setGlobalPrivilege(owner, player, privilege) }
override fun getChannelToUpdateParcelData(): SendChannel<Pair<ParcelId, ParcelData>> = b.openChannelForWriting { b.setParcelData(it.first, it.second) }
}

2
src/main/kotlin/io/dico/parcels2/storage/migration/plotme/PlotmeMigration.kt
View File

@@ -69,7 +69,7 @@ class PlotmeMigration(val options: PlotmeMigrationOptions) : Migration {
fun PlotmePlotPlayerMap.transmitPlotmeAddedTable(kind: Privilege) {
selectAll().forEach { row ->
val parcel = getParcelId(this, row) ?: return@forEach
val profile = StatusKey.safe(row[player_uuid]?.toUUID(), row[player_name]) ?: return@forEach
val profile = PrivilegeKey.safe(row[player_uuid]?.toUUID(), row[player_name]) ?: return@forEach
target.setLocalPrivilege(parcel, profile, kind)
}
}