Correctly handle road flags

This commit is contained in:
dordsor21 2020-10-11 19:19:17 +01:00
parent b55d836871
commit cfd432886d
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B

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 {