Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-25 20:16:06 +01:00
Code Issues Projects Releases Wiki Activity

We shouldn't try to load deleted worlds

Browse Source
This commit is contained in:
main() 2012-08-06 11:29:54 +02:00
parent e197091bb2
commit 3395f3d7c7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java
View File

@ -101,14 +101,14 @@ public class WorldManager implements MVWorldManager {
final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName); final File oldWorldFile = new File(this.plugin.getServer().getWorldContainer(), oldName);
final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName); final File newWorldFile = new File(this.plugin.getServer().getWorldContainer(), newName);
// Make sure the new world doesn't exist outside of multiverse. // Make sure the new world doesn't exist outside of multiverse.
if (newWorldFile.exists()) { if (newWorldFile.exists()) {
return false; return false;
} }
unloadWorld(oldName); unloadWorld(oldName);
removePlayersFromWorld(oldName); removePlayersFromWorld(oldName);
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
@ -116,6 +116,7 @@ public class WorldManager implements MVWorldManager {
this.plugin.log(Level.INFO, builder.toString()); this.plugin.log(Level.INFO, builder.toString());
try { try {
Thread t = new Thread(new Runnable() { Thread t = new Thread(new Runnable() {
@Override
public void run() { public void run() {
FileUtils.copyFolder(oldWorldFile, newWorldFile, Logger.getLogger("Minecraft")); FileUtils.copyFolder(oldWorldFile, newWorldFile, Logger.getLogger("Minecraft"));
} }
@ -133,7 +134,7 @@ public class WorldManager implements MVWorldManager {
return false; return false;
} }
this.plugin.log(Level.INFO, "Kind of copied stuff"); this.plugin.log(Level.INFO, "Kind of copied stuff");
WorldCreator worldCreator = new WorldCreator(newName); WorldCreator worldCreator = new WorldCreator(newName);
this.plugin.log(Level.INFO, "Started to copy settings"); this.plugin.log(Level.INFO, "Started to copy settings");
worldCreator.copy(this.getMVWorld(oldName).getCBWorld()); worldCreator.copy(this.getMVWorld(oldName).getCBWorld());
@ -322,6 +323,8 @@ public class WorldManager implements MVWorldManager {
this.plugin.log(Level.WARNING, "Hmm Multiverse does not know about this world but it's loaded in memory."); this.plugin.log(Level.WARNING, "Hmm Multiverse does not know about this world but it's loaded in memory.");
this.plugin.log(Level.WARNING, "To let Multiverse know about it, use:"); this.plugin.log(Level.WARNING, "To let Multiverse know about it, use:");
this.plugin.log(Level.WARNING, String.format("/mv import %s %s", name, this.plugin.getServer().getWorld(name).getEnvironment().toString())); this.plugin.log(Level.WARNING, String.format("/mv import %s %s", name, this.plugin.getServer().getWorld(name).getEnvironment().toString()));
} else if (this.worldsFromTheConfig.containsKey(name)) {
return true; // it's already unloaded
} else { } else {
this.plugin.log(Level.INFO, "Multiverse does not know about " + name + " and it's not loaded by Bukkit."); this.plugin.log(Level.INFO, "Multiverse does not know about " + name + " and it's not loaded by Bukkit.");
} }
@ -377,6 +380,13 @@ public class WorldManager implements MVWorldManager {
if (worlds.containsKey(worldName)) if (worlds.containsKey(worldName))
throw new IllegalArgumentException("That world is already loaded!"); throw new IllegalArgumentException("That world is already loaded!");
} }
if (!new File(this.plugin.getServer().getWorldContainer(), worldName).exists()) {
this.plugin.log(Level.WARNING, "WorldManager: Can't load this world because the folder was deleted/moved: " + worldName);
this.plugin.log(Level.WARNING, "Use '/mv remove' to remove it from the config!");
return false;
}
MVWorld mvworld = worldsFromTheConfig.get(worldName); MVWorld mvworld = worldsFromTheConfig.get(worldName);
World cbworld; World cbworld;
try { try {