1 files changed, 19 insertions, 22 deletions

diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java
index 17301ed92..3aea269e4 100644
--- a/Essentials/src/net/ess3/backup/Backup.java
+++ b/Essentials/src/net/ess3/backup/Backup.java
@@ -1,25 +1,22 @@
 package net.ess3.backup;
 
+import static net.ess3.I18n._;
+import net.ess3.api.IBackup;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.server.CommandSender;
+import net.ess3.api.server.IServer;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import lombok.Cleanup;
-import static net.ess3.I18n._;
-import net.ess3.api.IBackup;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 
 
 public class Backup implements Runnable, IBackup
 {
-	private static final Logger LOGGER = Bukkit.getLogger();
-	private transient final Server server;
+	private transient final IServer server;
 	private transient final IEssentials ess;
 	private transient final AtomicBoolean running = new AtomicBoolean(false);
 	private transient int taskId = -1;
@@ -29,7 +26,7 @@ public class Backup implements Runnable, IBackup
 	{
 		this.ess = ess;
 		server = ess.getServer();
-		if (server.getOnlinePlayers().length > 0)
+		if (!server.getOnlinePlayers().isEmpty())
 		{
 			startTask();
 		}
@@ -49,7 +46,7 @@ public class Backup implements Runnable, IBackup
 				running.set(false);
 				return;
 			}
-			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
+			taskId = ess.getPlugin().scheduleSyncRepeatingTask(this, interval, interval);
 		}
 	}
 
@@ -68,12 +65,12 @@ public class Backup implements Runnable, IBackup
 		{
 			return;
 		}
-		LOGGER.log(Level.INFO, _("backupStarted"));
+		ess.getLogger().log(Level.INFO, _("backupStarted"));
 		final CommandSender consoleSender = server.getConsoleSender();
 		server.dispatchCommand(consoleSender, "save-all");
 		server.dispatchCommand(consoleSender, "save-off");
 
-		ess.scheduleAsyncDelayedTask(new BackupRunner(command));
+		ess.getPlugin().scheduleAsyncDelayedTask(new BackupRunner(command));
 	}
 
 
@@ -93,7 +90,7 @@ public class Backup implements Runnable, IBackup
 			{
 				final ProcessBuilder childBuilder = new ProcessBuilder(command);
 				childBuilder.redirectErrorStream(true);
-				childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+				childBuilder.directory(ess.getPlugin().getRootFolder());
 				final Process child = childBuilder.start();
 				final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
 				try
@@ -105,7 +102,7 @@ public class Backup implements Runnable, IBackup
 						line = reader.readLine();
 						if (line != null)
 						{
-							LOGGER.log(Level.INFO, line);
+							ess.getLogger().log(Level.INFO, line);
 						}
 					}
 					while (line != null);
@@ -117,15 +114,15 @@ public class Backup implements Runnable, IBackup
 			}
 			catch (InterruptedException ex)
 			{
-				LOGGER.log(Level.SEVERE, null, ex);
+				ess.getLogger().log(Level.SEVERE, null, ex);
 			}
 			catch (IOException ex)
 			{
-				LOGGER.log(Level.SEVERE, null, ex);
+				ess.getLogger().log(Level.SEVERE, null, ex);
 			}
 			finally
 			{
-				ess.scheduleSyncDelayedTask(new EnableSavingRunner());
+				ess.getPlugin().scheduleSyncDelayedTask(new EnableSavingRunner());
 			}
 		}
 	}
@@ -137,17 +134,17 @@ public class Backup implements Runnable, IBackup
 		public void run()
 		{
 			server.dispatchCommand(server.getConsoleSender(), "save-on");
-			if (server.getOnlinePlayers().length == 0)
+			if (server.getOnlinePlayers().isEmpty())
 			{
 				running.set(false);
 				if (taskId != -1)
 				{
-					server.getScheduler().cancelTask(taskId);
+					ess.getPlugin().cancelTask(taskId);
 				}
 			}
 
 			active.set(false);
-			LOGGER.log(Level.INFO, _("backupFinished"));
+			ess.getLogger().log(Level.INFO, _("backupFinished"));
 		}
 	}
 }