From a61e1d69b201434f3a4e83c877a041393a340001 Mon Sep 17 00:00:00 2001
From: Dico <dico.karssiens@gmail.com>
Date: Mon, 24 Sep 2018 04:49:46 +0100
Subject: Fix compile errors

---
 src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt      | 1 +
 .../io/dico/parcels2/command/ParcelOptionsInteractCommand.kt     | 3 ++-
 .../io/dico/parcels2/defaultimpl/GlobalPrivilegesManagerImpl.kt  | 9 +++++----
 src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelWorldImpl.kt  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt b/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt
index 33825fb..3cb0621 100644
--- a/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt
+++ b/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt
@@ -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
diff --git a/src/main/kotlin/io/dico/parcels2/command/ParcelOptionsInteractCommand.kt b/src/main/kotlin/io/dico/parcels2/command/ParcelOptionsInteractCommand.kt
index feba76e..2923173 100644
--- a/src/main/kotlin/io/dico/parcels2/command/ParcelOptionsInteractCommand.kt
+++ b/src/main/kotlin/io/dico/parcels2/command/ParcelOptionsInteractCommand.kt
@@ -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)
diff --git a/src/main/kotlin/io/dico/parcels2/defaultimpl/GlobalPrivilegesManagerImpl.kt b/src/main/kotlin/io/dico/parcels2/defaultimpl/GlobalPrivilegesManagerImpl.kt
index 239fe0a..de9476b 100644
--- a/src/main/kotlin/io/dico/parcels2/defaultimpl/GlobalPrivilegesManagerImpl.kt
+++ b/src/main/kotlin/io/dico/parcels2/defaultimpl/GlobalPrivilegesManagerImpl.kt
@@ -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)
             }
         }
diff --git a/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelWorldImpl.kt b/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelWorldImpl.kt
index 519008c..c143ff6 100644
--- a/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelWorldImpl.kt
+++ b/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelWorldImpl.kt
@@ -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)
-- 
cgit v1.2.3