We can get the console command sender from server object now.

2 files changed, 21 insertions, 18 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Backup.java b/Essentials/src/com/earth2me/essentials/Backup.java
index b7b441b1e..02a3d54ba 100644
--- a/Essentials/src/com/earth2me/essentials/Backup.java
+++ b/Essentials/src/com/earth2me/essentials/Backup.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.craftbukkit.CraftServer;
 
@@ -12,7 +13,7 @@ import org.bukkit.craftbukkit.CraftServer;
 public class Backup implements Runnable
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private transient final CraftServer server;
+	private transient final Server server;
 	private transient final IEssentials ess;
 	private transient boolean running = false;
 	private transient int taskId = -1;
@@ -21,7 +22,7 @@ public class Backup implements Runnable
 	public Backup(final IEssentials ess)
 	{
 		this.ess = ess;
-		server = (CraftServer)ess.getServer();
+		server = ess.getServer();
 		if (server.getOnlinePlayers().length > 0)
 		{
 			startTask();
@@ -60,7 +61,7 @@ public class Backup implements Runnable
 			return;
 		}
 		LOGGER.log(Level.INFO, Util.i18n("backupStarted"));
-		final CommandSender cs = server.getServer().console;
+		final CommandSender cs = server.getConsoleSender();
 		server.dispatchCommand(cs, "save-all");
 		server.dispatchCommand(cs, "save-off");
 
diff --git a/Essentials/src/com/earth2me/essentials/Console.java b/Essentials/src/com/earth2me/essentials/Console.java
index 882c4f2c8..dcdb65a0d 100644
--- a/Essentials/src/com/earth2me/essentials/Console.java
+++ b/Essentials/src/com/earth2me/essentials/Console.java
@@ -2,33 +2,35 @@ package com.earth2me.essentials;
 
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.CraftServer;
 
-public final class Console implements IReplyTo {
+
+public final class Console implements IReplyTo
+{
 	private static Console instance = new Console();
 	private CommandSender replyTo;
 	public final static String NAME = "Console";
-	
-	private Console() {
-		
+
+	private Console()
+	{
 	}
-	
-	public static CommandSender getCommandSender(Server server) throws Exception {
-		if (! (server instanceof CraftServer)) {
-			throw new Exception(Util.i18n("invalidServer"));
-		}
-		return ((CraftServer)server).getServer().console;
+
+	public static CommandSender getCommandSender(Server server) throws Exception
+	{
+		return server.getConsoleSender();
 	}
 
-	public void setReplyTo(CommandSender user) {
+	public void setReplyTo(CommandSender user)
+	{
 		replyTo = user;
 	}
 
-	public CommandSender getReplyTo() {
+	public CommandSender getReplyTo()
+	{
 		return replyTo;
 	}
-	
-	public static Console getConsoleReplyTo() {
+
+	public static Console getConsoleReplyTo()
+	{
 		return instance;
 	}
 }