From a9c78e491ea4561ca344d65ed94b68687159ddb1 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sat, 8 Nov 2014 12:42:35 +1100 Subject: [PATCH] fixes #38 --- .../com/intellectualcrafters/plot/PlotHelper.java | 3 +++ .../plot/generator/WorldGenerator.java | 15 +++------------ PlotSquared/src/main/resources/plugin.yml | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java index 7717e632d..61597842f 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java @@ -319,6 +319,9 @@ public class PlotHelper { final PlotWorld plotworld = PlotMain.getWorldSettings(world); manager.setWall(world, plotworld, plot.id, block); + if (canSetFast) { + SetBlockFast.update(player); + } } public static void autoMerge(final World world, final Plot plot, final Player player) { 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 50f151d2c..b2b7c5d5a 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java @@ -34,7 +34,7 @@ public class WorldGenerator extends PlotGenerator { /** * plotworld object */ - DefaultPlotWorld plotworld; + DefaultPlotWorld plotworld = null; /** * Set to static to re-use the same managet for all Default World Generators */ @@ -157,18 +157,9 @@ public class WorldGenerator extends PlotGenerator { */ public WorldGenerator(final String world) { 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/resources/plugin.yml b/PlotSquared/src/main/resources/plugin.yml index a3c350278..7fca31e4c 100644 --- a/PlotSquared/src/main/resources/plugin.yml +++ b/PlotSquared/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: PlotSquared main: com.intellectualcrafters.plot.PlotMain -version: 2.2.2 +version: 2.2.3 load: STARTUP description: > Easy, yet powerful Plot World generation and management.