diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index e120c309b..08b1385c8 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -8,7 +8,7 @@
UTF-8
PlotSquared
- 2.7.0
+ 2.7.1
PlotSquared
jar
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
index 2b238840c..c75d8b1a3 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
@@ -112,7 +112,9 @@ public class PlotMeConverter {
count++;
final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
final String name = r.getString("owner");
- final String world = r.getString("world");
+ final String world = getWorld(r.getString("world"));
+
+
if (!plotSize.containsKey(world)) {
final int size = r.getInt("topZ") - r.getInt("bottomZ");
plotSize.put(world, size);
@@ -136,7 +138,7 @@ public class PlotMeConverter {
while (r.next()) {
final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
final String name = r.getString("player");
- final String world = r.getString("world");
+ final String world = getWorld(r.getString("world"));
UUID helper = UUIDHandler.getUUID(name);
if (helper == null) {
if (name.equals("*")) {
@@ -155,7 +157,7 @@ public class PlotMeConverter {
while (r.next()) {
final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
final String name = r.getString("player");
- final String world = r.getString("world");
+ final String world = getWorld(r.getString("world"));
UUID denied = UUIDHandler.getUUID(name);
if (denied == null) {
if (name.equals("*")) {
@@ -175,25 +177,26 @@ public class PlotMeConverter {
for (final String world : plots.keySet()) {
sendMessage("Copying config for: " + world);
try {
- final Integer pathwidth = plotConfig.getInt("worlds." + world + ".PathWidth"); //
+ String plotMeWorldName = world.toLowerCase();
+ final Integer pathwidth = plotConfig.getInt("worlds." + plotMeWorldName + ".PathWidth"); //
PlotMain.config.set("worlds." + world + ".road.width", pathwidth);
- final Integer plotsize = plotConfig.getInt("worlds." + world + ".PlotSize"); //
+ final Integer plotsize = plotConfig.getInt("worlds." + plotMeWorldName + ".PlotSize"); //
PlotMain.config.set("worlds." + world + ".plot.size", plotsize);
- final String wallblock = plotConfig.getString("worlds." + world + ".WallBlockId"); //
+ final String wallblock = plotConfig.getString("worlds." + plotMeWorldName + ".WallBlockId"); //
PlotMain.config.set("worlds." + world + ".wall.block", wallblock);
- final String floor = plotConfig.getString("worlds." + world + ".PlotFloorBlockId"); //
+ final String floor = plotConfig.getString("worlds." + plotMeWorldName + ".PlotFloorBlockId"); //
PlotMain.config.set("worlds." + world + ".plot.floor", Arrays.asList(floor));
- final String filling = plotConfig.getString("worlds." + world + ".PlotFillingBlockId"); //
+ final String filling = plotConfig.getString("worlds." + plotMeWorldName + ".PlotFillingBlockId"); //
PlotMain.config.set("worlds." + world + ".plot.filling", Arrays.asList(filling));
- final String road = plotConfig.getString("worlds." + world + ".RoadMainBlockId");
+ final String road = plotConfig.getString("worlds." + plotMeWorldName + ".RoadMainBlockId");
PlotMain.config.set("worlds." + world + ".road.block", road);
- final Integer height = plotConfig.getInt("worlds." + world + ".RoadHeight"); //
+ final Integer height = plotConfig.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
PlotMain.config.set("worlds." + world + ".road.height", height);
} catch (final Exception e) {
sendMessage("&c-- &lFailed to save configuration for world '" + world + "'\nThis will need to be done using the setup command, or manually");
@@ -205,25 +208,26 @@ public class PlotMeConverter {
final YamlConfiguration PLOTME_DG_YML = YamlConfiguration.loadConfiguration(PLOTME_DG_FILE);
try {
for (final String world : plots.keySet()) {
- final Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + world + ".PathWidth"); //
+ String plotMeWorldName = world.toLowerCase();
+ final Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PathWidth"); //
PlotMain.config.set("worlds." + world + ".road.width", pathwidth);
- final Integer plotsize = PLOTME_DG_YML.getInt("worlds." + world + ".PlotSize"); //
+ final Integer plotsize = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PlotSize"); //
PlotMain.config.set("worlds." + world + ".plot.size", plotsize);
- final String wallblock = PLOTME_DG_YML.getString("worlds." + world + ".WallBlock"); //
+ final String wallblock = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".WallBlock"); //
PlotMain.config.set("worlds." + world + ".wall.block", wallblock);
- final String floor = PLOTME_DG_YML.getString("worlds." + world + ".PlotFloorBlock"); //
+ final String floor = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".PlotFloorBlock"); //
PlotMain.config.set("worlds." + world + ".plot.floor", Arrays.asList(floor));
- final String filling = PLOTME_DG_YML.getString("worlds." + world + ".FillBlock"); //
+ final String filling = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".FillBlock"); //
PlotMain.config.set("worlds." + world + ".plot.filling", Arrays.asList(filling));
- final String road = PLOTME_DG_YML.getString("worlds." + world + ".RoadMainBlock");
+ final String road = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".RoadMainBlock");
PlotMain.config.set("worlds." + world + ".road.block", road);
- final Integer height = PLOTME_DG_YML.getInt("worlds." + world + ".RoadHeight"); //
+ final Integer height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
PlotMain.config.set("worlds." + world + ".road.height", height);
}
} catch (final Exception e) {
@@ -270,34 +274,35 @@ public class PlotMeConverter {
}
for (final String worldname : worlds) {
- final World world = Bukkit.getWorld(worldname);
- sendMessage("Reloading generator for world: '" + worldname + "'...");
+ final World world = Bukkit.getWorld(getWorld(worldname));
+ final String actualWorldName = world.getName();
+ sendMessage("Reloading generator for world: '" + actualWorldName + "'...");
- PlotMain.removePlotWorld(worldname);
+ PlotMain.removePlotWorld(actualWorldName);
if (MV) {
// unload
- Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + worldname);
+ Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + actualWorldName);
try {
Thread.sleep(1000);
} catch (final InterruptedException ex) {
Thread.currentThread().interrupt();
}
// load
- Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv import " + worldname + " normal -g PlotSquared");
+ Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv import " + actualWorldName + " normal -g PlotSquared");
} else if (MW) {
// unload
- Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw unload " + worldname);
+ Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw unload " + actualWorldName);
try {
Thread.sleep(1000);
} catch (final InterruptedException ex) {
Thread.currentThread().interrupt();
}
// load
- Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + worldname + " plugin:PlotSquared");
+ Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + actualWorldName + " plugin:PlotSquared");
} else {
Bukkit.getServer().unloadWorld(world, true);
- final World myworld = WorldCreator.name(worldname).generator(new HybridGen(worldname)).createWorld();
+ final World myworld = WorldCreator.name(actualWorldName).generator(new HybridGen(actualWorldName)).createWorld();
myworld.save();
}
}
@@ -316,6 +321,16 @@ public class PlotMeConverter {
}
}, 20);
}
+
+ public String getWorld(String world) {
+ for (World newworld : Bukkit.getWorlds()) {
+ if (newworld.getName().equalsIgnoreCase(world)) {
+ return newworld.getName();
+ }
+ }
+ return world;
+ }
+
private UUID uuidFromBytes(byte[] byteArray) {
ByteBuffer wrapped = ByteBuffer.wrap(byteArray);
long minor = wrapped.getLong();