EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

bug fixes???

Browse Source 
Josh was having trouble loading the worlds, so calling the load method
twice somehow fixed it??
This commit is contained in:
boy0001 2014-10-26 23:17:03 +11:00
parent 5c51a46271
commit e3e18b259d
5 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
View File

@ -78,10 +78,18 @@ public class PlayerFunctions {
public static Plot getBottomPlot(World world, Plot plot) { public static Plot getBottomPlot(World world, Plot plot) {
if (plot.settings.getMerged(0)) { if (plot.settings.getMerged(0)) {
return getBottomPlot(world, PlotMain.getPlots(world).get(new PlotId(plot.id.x, plot.id.y - 1))); Plot p = PlotMain.getPlots(world).get(new PlotId(plot.id.x, plot.id.y - 1));
if (p==null) {
return plot;
}
return getBottomPlot(world, p);
} }
if (plot.settings.getMerged(3)) { if (plot.settings.getMerged(3)) {
return getBottomPlot(world, PlotMain.getPlots(world).get(new PlotId(plot.id.x - 1, plot.id.y))); Plot p = PlotMain.getPlots(world).get(new PlotId(plot.id.x - 1, plot.id.y));
if (p==null) {
return plot;
}
return getBottomPlot(world, p);
} }
return plot; return plot;
} }

3
PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
View File

@ -1136,8 +1136,9 @@ public class PlotMain extends JavaPlugin {
if (!config.contains("worlds." + world)) { if (!config.contains("worlds." + world)) {
config.createSection("worlds." + world); config.createSection("worlds." + world);
} }
plotworld.saveConfiguration(config.getConfigurationSection("worlds." + world));
plotworld.saveConfiguration(config.getConfigurationSection("worlds." + world));
plotworld.loadDefaultConfiguration(config.getConfigurationSection("worlds." + world)); plotworld.loadDefaultConfiguration(config.getConfigurationSection("worlds." + world));
try { try {

4
PlotSquared/src/com/intellectualcrafters/plot/UUIDHandler.java
View File

@ -52,7 +52,9 @@ public class UUIDHandler {
} }
public static void add(StringWrapper name, UUID uuid) { public static void add(StringWrapper name, UUID uuid) {
uuidMap.put(name, uuid); if (!uuidMap.containsKey(name) && !uuidMap.inverse().containsKey(uuid)) {
uuidMap.put(name, uuid);
}
} }
/** /**

6
PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java
View File

@ -6,6 +6,7 @@ import org.bukkit.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.Configuration; import com.intellectualcrafters.plot.Configuration;
import com.intellectualcrafters.plot.ConfigurationNode; import com.intellectualcrafters.plot.ConfigurationNode;
import com.intellectualcrafters.plot.PlotBlock; import com.intellectualcrafters.plot.PlotBlock;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.PlotWorld; import com.intellectualcrafters.plot.PlotWorld;
public class DefaultPlotWorld extends PlotWorld { public class DefaultPlotWorld extends PlotWorld {
@ -160,6 +161,11 @@ public class DefaultPlotWorld extends PlotWorld {
@Override @Override
public void loadConfiguration(ConfigurationSection config) { public void loadConfiguration(ConfigurationSection config) {
this.PLOT_HEIGHT = config.getInt("plot.height"); this.PLOT_HEIGHT = config.getInt("plot.height");
if (!config.contains("plot.height")) {
PlotMain.sendConsoleSenderMessage(" - &Configuration is null? ("+config.getCurrentPath()+")");
}
this.PLOT_WIDTH = config.getInt("plot.size"); this.PLOT_WIDTH = config.getInt("plot.size");
this.MAIN_BLOCK = this.MAIN_BLOCK =
(PlotBlock[]) Configuration.BLOCKLIST.parseString(StringUtils.join(config.getStringList("plot.filling"), ',')); (PlotBlock[]) Configuration.BLOCKLIST.parseString(StringUtils.join(config.getStringList("plot.filling"), ','));

16
PlotSquared/src/com/intellectualcrafters/plot/generator/WorldGenerator.java
View File

@ -7,11 +7,14 @@ import java.util.Random;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.BlockPopulator;
import com.intellectualcrafters.plot.ConfigurationNode; import com.intellectualcrafters.plot.ConfigurationNode;
import com.intellectualcrafters.plot.PlotBlock; import com.intellectualcrafters.plot.PlotBlock;
import com.intellectualcrafters.plot.PlotGenerator; import com.intellectualcrafters.plot.PlotGenerator;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.PlotManager; import com.intellectualcrafters.plot.PlotManager;
import com.intellectualcrafters.plot.PlotWorld; import com.intellectualcrafters.plot.PlotWorld;
@ -148,6 +151,19 @@ public class WorldGenerator extends PlotGenerator {
public WorldGenerator(String world) { public WorldGenerator(String world) {
super(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);
}
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.plotsize = this.plotworld.PLOT_WIDTH; this.plotsize = this.plotworld.PLOT_WIDTH;
this.pathsize = this.plotworld.ROAD_WIDTH; this.pathsize = this.plotworld.ROAD_WIDTH;