diff options
Diffstat (limited to 'src/main/kotlin/io/dico/parcels2/command')
3 files changed, 8 insertions, 6 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/command/CommandsDebug.kt b/src/main/kotlin/io/dico/parcels2/command/CommandsDebug.kt index 3c5ba41..3ae17f2 100644 --- a/src/main/kotlin/io/dico/parcels2/command/CommandsDebug.kt +++ b/src/main/kotlin/io/dico/parcels2/command/CommandsDebug.kt @@ -5,7 +5,8 @@ import io.dico.dicore.command.EMessageType import io.dico.dicore.command.ExecutionContext import io.dico.dicore.command.annotation.Cmd import io.dico.parcels2.ParcelsPlugin -import io.dico.parcels2.blockvisitor.RegionTraversal +import io.dico.parcels2.blockvisitor.RegionTraverser +import io.dico.parcels2.doBlockOperation import org.bukkit.Bukkit import org.bukkit.Material import org.bukkit.entity.Player @@ -43,7 +44,7 @@ class CommandsDebug(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) { ) val random = Random() - world.doBlockOperation(parcel.id, direction = RegionTraversal.UPWARD) { block -> + world.blockManager.doBlockOperation(parcel.id, traverser = RegionTraverser.upward) { block -> block.blockData = blockDatas[random.nextInt(7)] }.onProgressUpdate(1000, 1000) { progress, elapsedTime -> context.sendMessage(EMessageType.INFORMATIVE, "Mess progress: %.02f%%, %.2fs elapsed" diff --git a/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt b/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt index 439d653..d02c974 100644 --- a/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt +++ b/src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt @@ -26,7 +26,7 @@ class CommandsGeneral(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) { val parcel = world.nextEmptyParcel() ?: error("This world is full, please ask an admin to upsize it") parcel.owner = PlayerProfile(uuid = player.uuid) - player.teleport(parcel.world.getHomeLocation(parcel.id)) + player.teleport(parcel.homeLocation) return "Enjoy your new parcel!" } @@ -63,7 +63,7 @@ class CommandsGeneral(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) { val match = target.getParcelSuspend(plugin.storage) ?: error("The specified parcel could not be matched") - player.teleport(match.world.getHomeLocation(match.id)) + player.teleport(match.homeLocation) return "" } @@ -100,7 +100,7 @@ class CommandsGeneral(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) { if (!sure) return "Are you sure? You cannot undo this action!\n" + "Run \"/${context.rawInput} -sure\" if you want to go through with this." - world.clearParcel(parcel.id) + world.blockManager.clearParcel(parcel.id) .onProgressUpdate(1000, 1000) { progress, elapsedTime -> val alt = context.getFormat(EMessageType.NUMBER) val main = context.getFormat(EMessageType.INFORMATIVE) diff --git a/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt b/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt index b633c3e..e2c7a1d 100644 --- a/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt +++ b/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt @@ -17,11 +17,12 @@ fun getParcelCommands(plugin: ParcelsPlugin): ICommandDispatcher { .addParameterType(true, ParcelTarget.PType(plugin.parcelProvider)) .group("parcel", "plot", "plots", "p") + .addRequiredPermission("parcels.command") .registerCommands(CommandsGeneral(plugin)) .registerCommands(CommandsAddedStatusLocal(plugin)) .group("option", "opt", "o") - //.apply { CommandsParcelOptions.setGroupDescription(this) } + .apply { CommandsParcelOptions.setGroupDescription(this) } .registerCommands(CommandsParcelOptions(plugin)) .parent() |