[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

1 files 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<IConf>();
 		settings = new Settings(this.getDataFolder());