Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-02 21:51:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix worlds being reported as deleted. Closes #52

Browse Source
This commit is contained in:
Eric Stokes 2011-08-08 18:17:55 -06:00
parent 1abcb187e6
commit 04779cb8ba
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commandhandler

@ -1 +1 @@
Subproject commit d0fbc8c65208722b6564c78100fd2ef3f1d68fb7
Subproject commit 978a713857aa777db45eba9e312679f49d96db6c

14
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -23,7 +23,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Listener;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.permissions.Permission;
import org.bukkit.plugin.Plugin;
@ -115,7 +114,6 @@ public class MultiverseCore extends JavaPlugin implements LoggablePlugin {
protected MVConfigMigrator migrator = new MVCoreConfigMigrator(this);
protected int pluginCount;
private DestinationFactory destFactory;
@Override
public void onLoad() {
@ -197,7 +195,7 @@ public class MultiverseCore extends JavaPlugin implements LoggablePlugin {
pm.registerEvent(Event.Type.PLUGIN_ENABLE, this.pluginListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.PLUGIN_DISABLE, this.pluginListener, Priority.Monitor, this);
pm.registerEvent(Event.Type.WEATHER_CHANGE, this.weatherListener, Priority.Normal, this);
pm.registerEvent(Event.Type.THUNDER_CHANGE, this.weatherListener, Priority.Normal, this);
}
@ -466,9 +464,15 @@ public class MultiverseCore extends JavaPlugin implements LoggablePlugin {
* @param name The name of the world to remove
* @return True if success, false if failure.
*/
public boolean deleteWorld(String name) {
public Boolean deleteWorld(String name) {
if (this.getServer().getWorld(name) != null) {
if(!unloadWorld(name, false)) {
// If the world was loaded, and we couldn't unload it, return false. DON"T DELTEE
return false;
}
}
removeWorldFromConfig(name);
unloadWorld(name, false);
try {
File serverFolder = new File(this.getDataFolder().getAbsolutePath()).getParentFile().getParentFile();
File worldFile = new File(serverFolder.getAbsolutePath() + File.separator + name);

3
src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java
View File

@ -25,7 +25,6 @@ public class DeleteCommand extends MultiverseCommand {
public void runCommand(CommandSender sender, List<String> args) {
Class<?> paramTypes[] = { String.class };
List<Object> objectArgs = new ArrayList<Object>(args);
this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs, paramTypes, "World Deleted!", "World was not deleted!");
//this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "deleteWorld", objectArgs, paramTypes, "Blah", "Blah", "Success", "Fail", 15);
this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs, paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
}
}