Fix compile errors
This commit is contained in:
@@ -8,6 +8,7 @@ import io.dico.dicore.command.annotation.Flag
|
||||
import io.dico.dicore.command.annotation.RequireParameters
|
||||
import io.dico.parcels2.ParcelsPlugin
|
||||
import io.dico.parcels2.PlayerProfile
|
||||
import io.dico.parcels2.Privilege
|
||||
import io.dico.parcels2.command.ParcelTarget.Kind
|
||||
import io.dico.parcels2.util.ext.hasParcelHomeOthers
|
||||
import io.dico.parcels2.util.ext.hasPermAdminManage
|
||||
|
||||
@@ -7,6 +7,7 @@ import io.dico.dicore.command.IContextFilter
|
||||
import io.dico.dicore.command.parameter.type.ParameterTypes
|
||||
import io.dico.parcels2.Interactables
|
||||
import io.dico.parcels2.ParcelProvider
|
||||
import io.dico.parcels2.Privilege
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
|
||||
@@ -18,7 +19,7 @@ class ParcelOptionsInteractCommand(val parcelProvider: ParcelProvider) : Command
|
||||
}
|
||||
|
||||
override fun execute(sender: CommandSender, context: ExecutionContext): String? {
|
||||
val parcel = parcelProvider.getParcelRequired(sender as Player, owner = true)
|
||||
val parcel = parcelProvider.getParcelRequired(sender as Player, Privilege.CAN_MANAGE)
|
||||
val interactableClassName = context.address.mainKey
|
||||
val allowed: Boolean = context.get("allowed")
|
||||
val change = parcel.interactableConfig.setInteractable(Interactables[interactableClassName], allowed)
|
||||
|
||||
@@ -13,9 +13,10 @@ class GlobalPrivilegesManagerImpl(val plugin: ParcelsPlugin) : GlobalPrivilegesM
|
||||
return map[owner] ?: GlobalPrivilegesImpl(owner).also { map[owner] = it }
|
||||
}
|
||||
|
||||
private inner class GlobalPrivilegesImpl(override val owner: PlayerProfile,
|
||||
data: MutablePrivilegeMap = emptyData)
|
||||
: PrivilegesHolder(data), GlobalPrivileges {
|
||||
private inner class GlobalPrivilegesImpl(
|
||||
override val owner: PlayerProfile,
|
||||
data: MutablePrivilegeMap = emptyData
|
||||
) : PrivilegesHolder(data), GlobalPrivileges {
|
||||
|
||||
private inline var data get() = map; set(value) = run { map = value }
|
||||
private inline val isEmpty get() = data === emptyData
|
||||
@@ -25,7 +26,7 @@ class GlobalPrivilegesManagerImpl(val plugin: ParcelsPlugin) : GlobalPrivilegesM
|
||||
if (privilege == Privilege.DEFAULT) return false
|
||||
data = mutableMapOf()
|
||||
}
|
||||
return super.set(key, privilege).alsoIfTrue {
|
||||
return super<PrivilegesHolder>.setPrivilege(key, privilege).alsoIfTrue {
|
||||
plugin.storage.setGlobalPrivilege(owner, key, privilege)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ class ParcelWorldImpl(override val world: World,
|
||||
override val generator: ParcelGenerator,
|
||||
override var options: RuntimeWorldOptions,
|
||||
override val storage: Storage,
|
||||
val globalPrivileges: GlobalPrivilegesManager,
|
||||
override val globalPrivileges: GlobalPrivilegesManager,
|
||||
containerFactory: ParcelContainerFactory,
|
||||
coroutineScope: CoroutineScope,
|
||||
worktimeLimiter: WorktimeLimiter)
|
||||
|
||||
Reference in New Issue
Block a user