This commit is contained in:
Telesphoreo 2020-10-13 21:18:12 -05:00
commit 59ea2c7e04
4 changed files with 10 additions and 45 deletions

View file

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

View file

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

View file

@ -374,9 +374,7 @@ public abstract class PlotArea {
this.spawnCustom = config.getBoolean("event.spawn.custom"); this.spawnCustom = config.getBoolean("event.spawn.custom");
this.spawnBreeding = config.getBoolean("event.spawn.breeding"); 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");
if (roadflags.isEmpty()) { if (roadflags.isEmpty()) {
roadflags = new ArrayList<>(); roadflags = new ArrayList<>();
ConfigurationSection section = config.getConfigurationSection("road.flags"); ConfigurationSection section = config.getConfigurationSection("road.flags");
@ -387,11 +385,10 @@ public abstract class PlotArea {
} }
} }
} }
}
this.getRoadFlagContainer().addAll(parseFlags(roadflags)); this.getRoadFlagContainer().addAll(parseFlags(roadflags));
StringBuilder roadFlagBuilder = new StringBuilder(); StringBuilder roadFlagBuilder = new StringBuilder();
Collection<PlotFlag<?, ?>> roadFlagCollection = this.getFlagContainer().getFlagMap().values(); Collection<PlotFlag<?, ?>> roadFlagCollection = this.getRoadFlagContainer().getFlagMap().values();
if (roadFlagCollection.isEmpty()) { if (roadFlagCollection.isEmpty()) {
roadFlagBuilder.append(Captions.NONE.getTranslated()); roadFlagBuilder.append(Captions.NONE.getTranslated());
} else { } else {

View file

@ -34,7 +34,7 @@ ext {
git = Grgit.open(dir: new File(rootDir.toString() + "/.git")) git = Grgit.open(dir: new File(rootDir.toString() + "/.git"))
} }
def ver = "5.13.7" def ver = "5.13.8"
def versuffix = "" def versuffix = ""
ext { ext {
if (project.hasProperty("versionsuffix")) { if (project.hasProperty("versionsuffix")) {