Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-28 12:56:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty default flag message

Browse Source
This commit is contained in:
NotMyFault 2021-05-02 20:31:23 +02:00
parent 0106a4222d
commit b3aec8f839
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
View File

@ -124,7 +124,6 @@ public abstract class PlotArea {
new FlagContainer(GlobalFlagContainer.getInstance()); new FlagContainer(GlobalFlagContainer.getInstance());
private final YamlConfiguration worldConfiguration; private final YamlConfiguration worldConfiguration;
private final GlobalBlockQueue globalBlockQueue; private final GlobalBlockQueue globalBlockQueue;
private int maxPlotMembers = 128;
private boolean autoMerge = false; private boolean autoMerge = false;
private boolean allowSigns = true; private boolean allowSigns = true;
private boolean miscSpawnUnowned = false; private boolean miscSpawnUnowned = false;
@ -325,7 +324,6 @@ public abstract class PlotArea {
this.miscSpawnUnowned = config.getBoolean("misc_spawn_unowned"); this.miscSpawnUnowned = config.getBoolean("misc_spawn_unowned");
this.mobSpawnerSpawning = config.getBoolean("mob_spawner_spawning"); this.mobSpawnerSpawning = config.getBoolean("mob_spawner_spawning");
this.autoMerge = config.getBoolean("plot.auto_merge"); this.autoMerge = config.getBoolean("plot.auto_merge");
this.maxPlotMembers = config.getInt("limits.max-members");
this.allowSigns = config.getBoolean("plot.create_signs"); this.allowSigns = config.getBoolean("plot.create_signs");
String biomeString = config.getString("plot.biome"); String biomeString = config.getString("plot.biome");
if (!biomeString.startsWith("minecraft:")) { if (!biomeString.startsWith("minecraft:")) {
@ -425,7 +423,7 @@ public abstract class PlotArea {
Collection<PlotFlag<?, ?>> flagCollection = this.getFlagContainer().getFlagMap().values(); Collection<PlotFlag<?, ?>> flagCollection = this.getFlagContainer().getFlagMap().values();
flagsComponent = getFlagsComponent(flagsComponent, flagCollection); flagsComponent = getFlagsComponent(flagsComponent, flagCollection);
ConsolePlayer.getConsole().sendMessage( ConsolePlayer.getConsole().sendMessage(
StaticCaption.of("[P2] - area flags: <flags>"), TranslatableCaption.of("flags.area_flags"),
Template.of("flags", flagsComponent) Template.of("flags", flagsComponent)
); );
@ -450,7 +448,7 @@ public abstract class PlotArea {
Collection<PlotFlag<?, ?>> roadFlagCollection = this.getRoadFlagContainer().getFlagMap().values(); Collection<PlotFlag<?, ?>> roadFlagCollection = this.getRoadFlagContainer().getFlagMap().values();
roadFlagsComponent = getFlagsComponent(roadFlagsComponent, roadFlagCollection); roadFlagsComponent = getFlagsComponent(roadFlagsComponent, roadFlagCollection);
ConsolePlayer.getConsole().sendMessage( ConsolePlayer.getConsole().sendMessage(
StaticCaption.of("[P2] - road flags: <flags>"), TranslatableCaption.of("flags.road_flags"),
Template.of("flags", roadFlagsComponent) Template.of("flags", roadFlagsComponent)
); );

2
Core/src/main/resources/lang/messages_en.json
View File

@ -586,6 +586,8 @@
"flags.flag_error_stringlist": "<prefix>Flag value must be a string list.", "flags.flag_error_stringlist": "<prefix>Flag value must be a string list.",
"flags.flag_error_weather": "<prefix>Flag must be a weather: 'rain' or 'sun'.", "flags.flag_error_weather": "<prefix>Flag must be a weather: 'rain' or 'sun'.",
"flags.flag_error_music": "<prefix>Flag value must be a valid music disc ID.", "flags.flag_error_music": "<prefix>Flag value must be a valid music disc ID.",
"flags.area_flags": "<prefix><gray>Area flags: </gray><dark_aqua><flags></dark_aqua>",
"flags.road_flags": "<prefix><gray>Road flags: </gray><dark_aqua><flags></dark_aqua>",
"commands.description.add": "<gray>Allow a user to build in a plot while the plot owner is online.</gray>", "commands.description.add": "<gray>Allow a user to build in a plot while the plot owner is online.</gray>",
"commands.description.alias": "<gray>Set the plot alias.</gray>", "commands.description.alias": "<gray>Set the plot alias.</gray>",
"commands.description.area": "<gray>Create a new plot area.</gray>", "commands.description.area": "<gray>Create a new plot area.</gray>",