diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 3fe9883e9..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 2 -updates: -- package-ecosystem: gradle - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 - target-branch: v5 - ignore: - - dependency-name: com.google.guava:guava - versions: - - ">= 22.a" - - "< 23" - - dependency-name: com.google.guava:guava - versions: - - ">= 23.a" - - "< 24" - - dependency-name: com.squareup.okhttp3:okhttp - versions: - - "> 4.2.2" - - dependency-name: com.squareup.okio:okio - versions: - - "> 2.4.1" - - "< 3" - - dependency-name: com.squareup.retrofit2:retrofit - versions: - - "> 2.4.0" - - "< 3" - - dependency-name: net.kyori:text-adapter-bukkit - versions: - - "> 3.0.3" - - "< 3.1" diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index e1a448d80..c56c1b63d 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -21,7 +21,7 @@ com.plotsquared PlotSquared-Core - 5.13.7 + 5.13.8 compile diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index 704068a3d..0076b27e2 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -374,24 +374,21 @@ public abstract class PlotArea { this.spawnCustom = config.getBoolean("event.spawn.custom"); this.spawnBreeding = config.getBoolean("event.spawn.breeding"); - List roadflags = config.getStringList("flags.default"); + List roadflags = config.getStringList("road.flags"); if (roadflags.isEmpty()) { - roadflags = config.getStringList("road.flags"); - if (roadflags.isEmpty()) { - roadflags = new ArrayList<>(); - ConfigurationSection section = config.getConfigurationSection("road.flags"); - Set keys = section.getKeys(false); - for (String key : keys) { - if (!"default".equals(key)) { - roadflags.add(key + ';' + section.get(key)); - } + roadflags = new ArrayList<>(); + ConfigurationSection section = config.getConfigurationSection("road.flags"); + Set keys = section.getKeys(false); + for (String key : keys) { + if (!"default".equals(key)) { + roadflags.add(key + ';' + section.get(key)); } } } this.getRoadFlagContainer().addAll(parseFlags(roadflags)); StringBuilder roadFlagBuilder = new StringBuilder(); - Collection> roadFlagCollection = this.getFlagContainer().getFlagMap().values(); + Collection> roadFlagCollection = this.getRoadFlagContainer().getFlagMap().values(); if (roadFlagCollection.isEmpty()) { roadFlagBuilder.append(Captions.NONE.getTranslated()); } else { diff --git a/build.gradle b/build.gradle index 2b397a7f7..69b46159a 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ ext { git = Grgit.open(dir: new File(rootDir.toString() + "/.git")) } -def ver = "5.13.7" +def ver = "5.13.8" def versuffix = "" ext { if (project.hasProperty("versionsuffix")) {