From 23e1bc811aa08f07a228a0671b85f6f5b73b5f3d Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 2 May 2011 16:57:19 +0000 Subject: [PATCH] [trunk] Stop the server instead of reloading, since reloading does not unload worlds. This for compatibility to other multiworld plugins, since we load all unloaded worlds as normal worlds. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1319 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../src/com/earth2me/essentials/Essentials.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 3f51c75d5..8f32b85c8 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -78,8 +78,15 @@ public class Essentials extends JavaPlugin setStatic(); EssentialsUpgrade upgrade = new EssentialsUpgrade(this.getDescription().getVersion(), this); if (newWorldsLoaded) { - logger.log(Level.SEVERE, "New worlds have been loaded while upgrading files. Will reload the server."); - getServer().reload(); + logger.log(Level.SEVERE, "New worlds have been loaded while upgrading files. The server will stop now, please restart it."); + try + { + getServer().dispatchCommand(Console.getCommandSender(getServer()), "stop"); + } + catch (Exception ex) + { + logger.log(Level.SEVERE, "Failed to stop the server!", ex); + } } confList = new ArrayList(); settings = new Settings(this.getDataFolder());