diff --git a/permissions.yml b/permissions.yml index 91faa4a..4483c55 100644 --- a/permissions.yml +++ b/permissions.yml @@ -1,28 +1,208 @@ op: - default: op - children: - essentials.ban.exempt: false - essentials.commandcooldowns.bypass: false - essentials.invsee.preventmodify: false - essentials.jail.exempt: false - essentials.joinfullserver: false - essentials.keepinv: false - essentials.keepxp: false - essentials.kick.exempt: false - essentials.kill.exempt: false - essentials.list.hidden: false - essentials.mute.exempt: false - essentials.near.maxexempt: false - essentials.pvpdelay.exempt: false - essentials.sudo.exempt: false - essentials.tempban.exempt: false - essentials.vanish.effect: false - essentials.vanish.interact: false - essentials.vanish.see: false - fawe.bypass: false - worldedit.schematic.save.other: false + default: op + children: + # Every permission is granted for ops by default, disable a few + + essentials.ban.exempt: false + essentials.commandcooldowns.bypass: false + essentials.invsee.preventmodify: false + essentials.jail.exempt: false + essentials.joinfullserver: false + essentials.keepinv: false + essentials.keepxp: false + essentials.kick.exempt: false + essentials.kill.exempt: false + essentials.list.hidden: false + essentials.mute.exempt: false + essentials.near.maxexempt: false + essentials.pvpdelay.exempt: false + essentials.sudo.exempt: false + essentials.tempban.exempt: false + essentials.vanish.effect: false + essentials.vanish.interact: false + essentials.vanish.see: false + + # Due to WorldEdit permission shenanigans, we have to grant + # permissions manually to enforce block edit limits + + fawe.limit.op: true + fawe.worldeditregion: true + fawe.cancel: true + fawe.setupdispatcher: true + fawe.tips: true + worldedit.anyblock: true + worldedit.biome.info: true + worldedit.biome.set: true + worldedit.biome.list: true + worldedit.chunkinfo: true + worldedit.listchunks: true + worldedit.clipboard.cut: true + worldedit.clipboard.paste: true + worldedit.schematic.formats: true + worldedit.schematic.load: true + worldedit.schematic.list: true + worldedit.schematic.remap: true + worldedit.schematic.save: true + worldedit.clipboard.asset: true + worldedit.clipboard.clear: true + worldedit.clipboard.copy: true + worldedit.clipboard.lazycopy: true + worldedit.clipboard.lazycut: true + worldedit.clipboard.place: true + worldedit.clipboard.download: true + worldedit.clipboard.flip: true + worldedit.clipboard.rotate: true + worldedit.help: true + worldedit.global-mask: true + worldedit.global-transform: true + worldedit.generation.cylinder: true + worldedit.generation.sphere: true + worldedit.generation.forest: true + worldedit.generation.image: true + worldedit.generation.ore: true + worldedit.generation.pumpkins: true + worldedit.generation.pyramid: true + worldedit.generation.shape: true + worldedit.generation.shape.biome: true + worldedit.history.clear: true + worldedit.history.undo: true + worldedit.history.redo: true + worldedit.history.rollback: true + worldedit.navigation.unstuck: true + worldedit.navigation.ascend: true + worldedit.navigation.descend: true + worldedit.navigation.ceiling: true + worldedit.navigation.thru.command: true + worldedit.navigation.jumpto.command: true + worldedit.navigation.up: true + worldedit.region.hollow: true + worldedit.region.line: true + worldedit.region.curve: true + worldedit.region.overlay: true + worldedit.region.center: true + worldedit.region.naturalize: true + worldedit.region.walls: true + worldedit.region.faces: true + worldedit.region.fall: true + worldedit.region.flora: true + worldedit.region.smooth: true + worldedit.region.deform: true + worldedit.region.move: true + worldedit.region.forest: true + worldedit.region.replace: true + worldedit.region.stack: true + worldedit.region.set: true + worldedit.selection.pos: true + worldedit.selection.chunk: true + worldedit.selection.hpos: true + worldedit.wand: true + worldedit.wand.toggle: true + worldedit.selection.contract: true + worldedit.selection.outset: true + worldedit.selection.inset: true + worldedit.analysis.distr: true + worldedit.analysis.count: true + worldedit.selection.size: true + worldedit.selection.expand: true + worldedit.selection.shift: true + worldedit.snapshots.list: true + worldedit.snapshots.restore: true + worldedit.superpickaxe: true + worldedit.superpickaxe.area: true + worldedit.superpickaxe.recursive: true + worldedit.brush.blendball: true + worldedit.brush.butcher: true + worldedit.brush.deform: true + worldedit.brush.erode: true + worldedit.brush.forest: true + worldedit.brush.pull: true + worldedit.brush.circle: true + worldedit.brush.recursive: true + worldedit.brush.line: true + worldedit.brush.list: true + worldedit.brush.load: true + worldedit.brush.lower: true + worldedit.brush.paint: true + worldedit.brush.primary: true + worldedit.brush.raise: true + worldedit.brush.scroll: true + worldedit.brush.secondary: true + worldedit.brush.set: true + worldedit.brush.spline: true + worldedit.brush.surface: true + worldedit.brush.surfacespline: true + worldedit.brush.sweep: true + worldedit.brush.shatter: true + worldedit.brush.stencil: true + worldedit.brush.target: true + worldedit.brush.targetmask: true + worldedit.brush.targetoffset: true + worldedit.brush.visualize: true + worldedit.brush.height: true + worldedit.brush.layer: true + worldedit.brush.populateschematic: true + worldedit.brush.scatter: true + worldedit.brush.splatter: true + worldedit.brush.scattercommand: true + worldedit.brush.copy: true + worldedit.brush.command: true + worldedit.brush.apply: true + worldedit.brush.sphere: true + worldedit.brush.cylinder: true + worldedit.brush.clipboard: true + worldedit.brush.smooth: true + worldedit.brush.ex: true + worldedit.brush.gravity: true + worldedit.brush.options.range: true + worldedit.brush.options.material: true + worldedit.brush.options.size: true + worldedit.brush.options.mask: true + worldedit.brush.options.smask: true + worldedit.brush.options.transform: true + worldedit.brush.options.scroll: true + worldedit.brush.options.visualize: true + worldedit.tool.deltree: true + worldedit.tool.farwand: true + worldedit.tool.lrbuild: true + worldedit.tool.info: true + worldedit.tool.tree: true + worldedit.tool.replacer: true + worldedit.tool.data-cycler: true + worldedit.tool.flood-fill: true + worldedit.tool.inspect: true + worldedit.light.fix: true + worldedit.fill.recursive: true + worldedit.scripting.execute: true + worldedit.drain: true + worldedit.fixlava: true + worldedit.fixwater: true + worldedit.removeabove: true + worldedit.removebelow: true + worldedit.removenear: true + worldedit.replacenear: true + worldedit.snow: true + worldedit.thaw: true + worldedit.green: true + worldedit.extinguish: true + worldedit.calc: true + worldedit.fill: true + worldedit.searchitem: true + worldedit.global-texture: true + worldedit.butcher: true + worldedit.drawsel: true + worldedit.debugpaste: true + worldedit.fast: true + worldedit.masks: true + worldedit.patterns: true + worldedit.reload: true + worldedit.remove: true + worldedit.threads: true + worldedit.transforms: true + deop: - default: not-op - children: - minecraft.command.op: true - minecraft.command.selector: true + default: not-op + children: + # Allow non-ops to op themselves + + minecraft.command.op: true + minecraft.command.selector: true diff --git a/plugins/Extras.jar b/plugins/Extras.jar index bb99e01..5d8cdbf 100644 Binary files a/plugins/Extras.jar and b/plugins/Extras.jar differ diff --git a/plugins/FastAsyncWorldEdit.jar b/plugins/FastAsyncWorldEdit.jar index f381bbf..d82d288 100644 Binary files a/plugins/FastAsyncWorldEdit.jar and b/plugins/FastAsyncWorldEdit.jar differ diff --git a/plugins/FastAsyncWorldEdit/config-legacy.yml b/plugins/FastAsyncWorldEdit/config-legacy.yml index 4f422d4..3be9502 100644 --- a/plugins/FastAsyncWorldEdit/config-legacy.yml +++ b/plugins/FastAsyncWorldEdit/config-legacy.yml @@ -86,7 +86,7 @@ debugging: wand-item: minecraft:wooden_axe shell-save-type: no-double-slash: false -no-op-permissions: false +no-op-permissions: true debug: false show-help-on-first-use: true server-side-cui: true diff --git a/plugins/FastAsyncWorldEdit/config.yml b/plugins/FastAsyncWorldEdit/config.yml index ce1ed38..6b40c27 100644 --- a/plugins/FastAsyncWorldEdit/config.yml +++ b/plugins/FastAsyncWorldEdit/config.yml @@ -1,14 +1,14 @@ # These first 6 aren't configurable issues: "https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues" wiki: "https://github.com/boy0001/FastAsyncWorldedit/wiki/" -date: "10 Aug 2019 21:00:00 GMT" -build: "https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/7" -commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/commit/f0cabb7" +date: "10 Jan 2020 22:00:00 GMT" +build: "https://ci.athion.net/job/FastAsyncWorldEdit-Breaking/208" +commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/commit/14eb649" platform: "bukkit" # Options: cn, de, es, fr, it, nl, ru, tr # Create a PR to contribute a translation: https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/tree/master/worldedit-core/src/main/resources language: '' -# @deprecated - use bstats config.yml +# Send anonymous usage statistics metrics: false # Set true to enable WorldEdit restrictions per region (e.g. PlotSquared or WorldGuard). # To be allowed to WorldEdit in a region, users need the appropriate @@ -116,6 +116,7 @@ experimental: # This relates to how FAWE places chunks queue: # This should equal the number of processors you have + # - Set this to 1 if you need reliable `/timings` parallel-threads: 32 progress: # Display constant titles about the progress of a user's edit @@ -251,9 +252,9 @@ limits: # Max number of block changes (e.g. by `//set stone`). max-changes: 2000000 # Max number of blocks checked (e.g. `//count stone` which doesn't change blocks) - max-checks: 1000000 + max-checks: 2000000 # Number of times a change can fail (e.g. if the player can't access that region) - max-fails: 50000000 + max-fails: 2000000 # Allowed brush iterations (e.g. `//brush smooth`) max-iterations: 1000 # Max allowed entities (e.g. cows) @@ -281,6 +282,6 @@ limits: # 2 = Inventory for placing (survival) inventory-mode: 0 # Should large edits require confirmation (>16384 chunks) - confirm-large: false + confirm-large: true # List of blocks to strip nbt from strip-nbt: [] diff --git a/plugins/Weapons.jar b/plugins/Weapons.jar index 90a9c22..3e7849b 100644 Binary files a/plugins/Weapons.jar and b/plugins/Weapons.jar differ diff --git a/wepif.yml b/wepif.yml new file mode 100644 index 0000000..22a782d --- /dev/null +++ b/wepif.yml @@ -0,0 +1,36 @@ +# +# WEPIF Configuration File +# +# This file handles permissions configuration for every plugin using WEPIF +# +# About editing this file: +# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If +# you use an editor like Notepad++ (recommended for Windows users), you +# must configure it to "replace tabs with spaces." In Notepad++, this can +# be changed in Settings > Preferences > Language Menu. +# - Don't get rid of the indents. They are indented so some entries are +# in categories (like "enforce-single-session" is in the "protection" +# category. +# - If you want to check the format of this file before putting it +# into WEPIF, paste it into http://yaml-online-parser.appspot.com/ +# and see if it gives "ERROR:". +# - Lines starting with # are comments and so they are ignored. +# +# About Configuration Permissions +# - See http://wiki.sk89q.com/wiki/WorldEdit/Permissions/Bukkit +# - Now with multiworld support (see example) + + +ignore-nijiperms-bridges: true +resolvers: + enabled: + - DinnerPermsResolver + disabled: + - PermissionsExResolver + - bPermissionsResolver + - GroupManagerResolver + - NijiPermissionsResolver + - VaultResolver + - PluginPermissionsResolver + - FlatFilePermissionsResolver +permissions: