diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/Flag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Flag.java index ffb5122f9..1c60818fd 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/Flag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Flag.java @@ -38,7 +38,7 @@ public class Flag { * @throws IllegalArgumentException if you provide inadequate inputs */ public Flag(final AbstractFlag key, final String value) { - final char[] allowedCharacters = new char[]{'[', ']', '(', ')', ',', '_', '-', '.', ',', '?', '!', '&', '�'}; + final char[] allowedCharacters = new char[]{'[', ']', '(', ')', ',', '_', '-', '.', ',', '?', '!', '&', ':', '§'}; String tempValue = value; for (final char c : allowedCharacters) { tempValue = tempValue.replace(c, 'c'); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java index 40805a6c5..3556995f2 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java @@ -179,16 +179,7 @@ public class WorldGenerator extends PlotGenerator { super(world); if (this.plotworld == null) { - this.plotworld = new DefaultPlotWorld(world); - if (!PlotMain.config.contains("worlds." + world)) { - PlotMain.config = YamlConfiguration.loadConfiguration(PlotMain.configFile); - PlotMain.config.createSection("worlds." + world); - } - final ConfigurationSection section = PlotMain.config.getConfigurationSection("worlds." + world); - this.plotworld.saveConfiguration(section); - this.plotworld.loadDefaultConfiguration(section); - this.plotworld.loadConfiguration(section); - PlotMain.sendConsoleSenderMessage("&cFailed to load the plotworld settings from the configuration. Attempting to reload it"); + this.plotworld = (DefaultPlotWorld) PlotMain.getWorldSettings(world); } this.plotsize = this.plotworld.PLOT_WIDTH; diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationObject.java b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationObject.java index e2f084bfd..a5caea172 100644 --- a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationObject.java +++ b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationObject.java @@ -21,7 +21,7 @@ public class TranslationObject { creationDescription = ""; } for (char c : key.toCharArray()) { - if (!Character.isDigit(c) && !Character.isAlphabetic(c) && c != '_' && c != '&' && c != '§' && c != ':') { + if (!Character.isDigit(c) && !Character.isAlphabetic(c) && c != '_' && c != '&' && c != '§' && c != ':') { throw new RuntimeException( String.format("Translation: '%s' is invalid (Character: '%s') - Only alphanumeric + (\\, _, &, §, :) charcters are allowed", key, c + "" diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java b/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java index 58a958d0e..031c13bbf 100644 --- a/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java +++ b/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java @@ -23,7 +23,7 @@ public class BukkitTranslation { public static String convert(TranslationAsset asset) { // In some cases newline can screw stuff up, so I added a new character thing // &- = new line - return asset.getTranslated().replace("&-", "\n").replace('&', '§'); + return asset.getTranslated().replace("&-", "\n").replace('&', '§'); } /**