From 2c5ef99288baced90ba30e3120f180cf9a81c758 Mon Sep 17 00:00:00 2001 From: Chromachine Date: Sat, 23 Jun 2018 23:45:24 +0000 Subject: [PATCH] Remove overworld gm perms for builders And other, automatic changes --- Jobs/generalConfig.yml | 10 ++-- Multiverse-Core/worlds.yml | 96 +++++++++++++++--------------- PermissionsEx/permissions.yml | 15 +++-- PlotSquared/config/settings.yml | 6 +- PlotSquared/translations/style.yml | 2 +- 5 files changed, 68 insertions(+), 61 deletions(-) diff --git a/Jobs/generalConfig.yml b/Jobs/generalConfig.yml index 7db35a2..f4ef59f 100755 --- a/Jobs/generalConfig.yml +++ b/Jobs/generalConfig.yml @@ -258,16 +258,16 @@ ExploitProtections: # When enabled, players interacted furnaces will be saved into file and will be reassigned after restart to keep giving out money # Players will no longer need to click on furnace to get paid from it after server restart Reassign: true - # Defines max avaible furnaces each player can have to get paid from - # This can be ovveriden with jobs.maxfurnaces.[amount] permission node + # Defines max available furnaces each player can have to get paid from + # This can be overridden with jobs.maxfurnaces.[amount] permission node MaxDefaultAvailable: 20 BrewingStands: # When enabled, players interacted brewing stands will be saved into file and will be reassigned after restart to keep giving out money # Players will no longer need to click on brewing stand to get paid from it after server restart Reassign: true - # Defines max avaible brewing stands each player can have to get paid from + # Defines max available brewing stands each player can have to get paid from # Set to 0 if you want to disable this limitation - # This can be ovveriden with jobs.maxbrewingstands.[amount] permission node + # This can be overridden with jobs.maxbrewingstands.[amount] permission node MaxDefaultAvailable: 20 General: # Enable blocks protection, like ore, from exploiting by placing and destroying same block again and again. @@ -275,7 +275,7 @@ ExploitProtections: PlaceAndBreakProtection: true # For how long in days to keep block protection data in data base # This will clean block data which ones have -1 as cooldown value - # Data base cleannup will be performed on each server startup + # Data base cleanup will be performed on each server startup KeepDataFor: 14 # All blocks will be protected X sec after player places it on ground. GlobalBlockTimer: diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml index dba7abf..5849993 100755 --- a/Multiverse-Core/worlds.yml +++ b/Multiverse-Core/worlds.yml @@ -95,54 +95,6 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' - world_the_end: - ==: MVWorld - hidden: 'false' - alias: world_the_end - color: WHITE - style: NORMAL - pvp: 'true' - scale: '16.0' - respawnWorld: '' - allowWeather: 'true' - difficulty: EASY - spawning: - ==: MVSpawnSettings - animals: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - monsters: - ==: MVSpawnSubSettings - spawn: 'true' - spawnrate: '-1' - exceptions: [] - entryfee: - ==: MVEntryFee - amount: '0.0' - currency: '-1' - hunger: 'true' - autoHeal: 'true' - adjustSpawn: 'true' - portalForm: ALL - gameMode: SURVIVAL - keepSpawnInMemory: 'true' - spawnLocation: - ==: MVSpawnLocation - x: -4.710357902146693 - y: 59.0 - z: 0.6541565622183771 - pitch: 2.5500019 - yaw: -91.005165 - autoLoad: 'true' - bedRespawn: 'true' - worldBlacklist: [] - environment: THE_END - seed: '2133291894169730654' - generator: 'null' - playerLimit: '-1' - allowFlight: 'true' world: ==: MVWorld hidden: 'false' @@ -191,6 +143,54 @@ worlds: generator: TerrainControl playerLimit: '-1' allowFlight: 'true' + world_the_end: + ==: MVWorld + hidden: 'false' + alias: world_the_end + color: WHITE + style: NORMAL + pvp: 'true' + scale: '16.0' + respawnWorld: '' + allowWeather: 'true' + difficulty: EASY + spawning: + ==: MVSpawnSettings + animals: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + monsters: + ==: MVSpawnSubSettings + spawn: 'true' + spawnrate: '-1' + exceptions: [] + entryfee: + ==: MVEntryFee + amount: '0.0' + currency: '-1' + hunger: 'true' + autoHeal: 'true' + adjustSpawn: 'true' + portalForm: ALL + gameMode: SURVIVAL + keepSpawnInMemory: 'true' + spawnLocation: + ==: MVSpawnLocation + x: -4.710357902146693 + y: 59.0 + z: 0.6541565622183771 + pitch: 2.5500019 + yaw: -91.005165 + autoLoad: 'true' + bedRespawn: 'true' + worldBlacklist: [] + environment: THE_END + seed: '2133291894169730654' + generator: 'null' + playerLimit: '-1' + allowFlight: 'true' test: ==: MVWorld hidden: 'false' diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml index b0ba5bb..4489b47 100644 --- a/PermissionsEx/permissions.yml +++ b/PermissionsEx/permissions.yml @@ -120,10 +120,8 @@ groups: - trusted permissions: - essentials.sethome.multiple.builder - - essentials.gamemode.survival - essentials.bigtree - essentials.fly - - essentials.gamemode - multiverse.teleport.self.test - multiverse.teleport.other.test options: @@ -282,8 +280,7 @@ users: f48bf937-cb2f-4cae-ad75-c835ae563903: options: name: HasOkayInternet - group: - - builder + group: [] permissions: [] bd0c72e7-f5a6-49be-a407-ad69e72a3431: group: @@ -646,3 +643,13 @@ users: - member options: name: AnonymousDev + 440db08b-b3db-4ef3-9edc-359adcf09c95: + group: + - member + options: + name: Dreamsword96 + fa0591b3-67d7-4c2c-9586-f0578e857f65: + group: + - member + options: + name: Raz0R_CP9 diff --git a/PlotSquared/config/settings.yml b/PlotSquared/config/settings.yml index 6e0becb..955a33d 100755 --- a/PlotSquared/config/settings.yml +++ b/PlotSquared/config/settings.yml @@ -1,9 +1,9 @@ # These first 4 aren't configurable issues: "https://github.com/IntellectualSites/PlotSquared/issues" wiki: "https://github.com/IntellectualSites/PlotSquared/wiki" -date: "20 Jul 2018 00:00:00 GMT" -build: "https://ci.athion.net/job/PlotSquared/2014" -commit: "https://github.com/IntellectualSites/PlotSquared/commit/df6914f" +date: "23 Jul 2018 00:00:00 GMT" +build: "https://ci.athion.net/job/PlotSquared/2017" +commit: "https://github.com/IntellectualSites/PlotSquared/commit/79e1ea9" platform: "Bukkit" # Show additional information in console debug: true diff --git a/PlotSquared/translations/style.yml b/PlotSquared/translations/style.yml index adf47a3..2eae594 100755 --- a/PlotSquared/translations/style.yml +++ b/PlotSquared/translations/style.yml @@ -1,4 +1,4 @@ -version: PlotSquared-18.6.20-df6914f-2014 +version: PlotSquared-18.6.23-79e1ea9-2017 color: '3': '8' '4': '3'