Merge https://github.com/IntellectualSites/PlotSquared into 1.16

.github/dependabot.yml

@@ -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"

Bukkit/pom.xml

@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.plotsquared</groupId>
       <artifactId>PlotSquared-Core</artifactId>
-      <version>5.13.7</version>
+      <version>5.13.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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<String> roadflags = config.getStringList("flags.default");
+        List<String> roadflags = config.getStringList("road.flags");
         if (roadflags.isEmpty()) {
-            roadflags = config.getStringList("road.flags");
+            roadflags = new ArrayList<>();
-            if (roadflags.isEmpty()) {
+            ConfigurationSection section = config.getConfigurationSection("road.flags");
-                roadflags = new ArrayList<>();
+            Set<String> keys = section.getKeys(false);
-                ConfigurationSection section = config.getConfigurationSection("road.flags");
+            for (String key : keys) {
-                Set<String> keys = section.getKeys(false);
+                if (!"default".equals(key)) {
-                for (String key : keys) {
+                    roadflags.add(key + ';' + section.get(key));
-                    if (!"default".equals(key)) {
-                        roadflags.add(key + ';' + section.get(key));
-                    }
                 }
             }
         }
         this.getRoadFlagContainer().addAll(parseFlags(roadflags));
 
         StringBuilder roadFlagBuilder = new StringBuilder();
-        Collection<PlotFlag<?, ?>> roadFlagCollection = this.getFlagContainer().getFlagMap().values();
+        Collection<PlotFlag<?, ?>> roadFlagCollection = this.getRoadFlagContainer().getFlagMap().values();
         if (roadFlagCollection.isEmpty()) {
             roadFlagBuilder.append(Captions.NONE.getTranslated());
         } else {

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")) {