1 files changed, 61 insertions, 14 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/SaveMap.java b/src/main/java/net/tylermurphy/hideAndSeek/commands/SaveMap.java
index c5b753f..37ead8a 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/SaveMap.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/commands/SaveMap.java
@@ -3,12 +3,19 @@ package net.tylermurphy.hideAndSeek.commands;
 import static net.tylermurphy.hideAndSeek.Store.*;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.util.Functions;
 import net.tylermurphy.hideAndSeek.util.ICommand;
 
 public class SaveMap implements ICommand {
@@ -18,23 +25,63 @@ public class SaveMap implements ICommand {
 			sender.sendMessage(errorPrefix + "Please set spawn location first");
 			return;
 		}
-		sender.sendMessage(warningPrefix + "This command may lag the server");
+		sender.sendMessage(messagePrefix + "Starting map save");
+		sender.sendMessage(warningPrefix + "All commands will be disabled when the save is in progress. Do not turn off the server.");
 		Bukkit.getServer().getWorld(spawnWorld).save();
-		File current = new File(Main.root+File.separator+spawnWorld);
-		if(current.exists()) {
-			File destenation = new File(Main.root+File.separator+"hideandseek_"+spawnWorld);
-			if(destenation.exists()) {
-				deleteDirectory(destenation);
-				destenation.mkdir();
+		BukkitRunnable runnable = new BukkitRunnable() {
+			public void run() {
+				File current = new File(Main.root+File.separator+spawnWorld);
+				if(current.exists()) {
+					File temp_destenation = new File(Main.root+File.separator+"temp_hideandseek_"+spawnWorld);
+					File destenation = new File(Main.root+File.separator+"hideandseek_"+spawnWorld);
+					copyFileStructure(current, temp_destenation);
+					if(destenation.exists()) {
+						deleteDirectory(destenation);
+						destenation.mkdir();
+					}
+					temp_destenation.renameTo(destenation);
+					sender.sendMessage(messagePrefix + "Map save complete");
+					runningBackup = false;
+				} else {
+					sender.sendMessage(errorPrefix + "Coudnt find current map");
+				}
 			}
-			Functions.copyFileStructure(current, destenation);
-			sender.sendMessage(messagePrefix + "Map save complete");
-		} else {
-			sender.sendMessage(errorPrefix + "Coudnt find current map");
-		}
+		};
+		runnable.runTaskAsynchronously(Main.plugin);
+		runningBackup = true;
+	}
+	
+	private static void copyFileStructure(File source, File target){
+	    try {
+	        ArrayList<String> ignore = new ArrayList<>(Arrays.asList("uid.dat", "session.lock"));
+	        if(!ignore.contains(source.getName())) {
+	            if(source.isDirectory()) {
+	                if(!target.exists())
+	                    if (!target.mkdirs())
+	                        throw new IOException("Couldn't create world directory!");
+	                String files[] = source.list();
+	                for (String file : files) {
+	                    File srcFile = new File(source, file);
+	                    File destFile = new File(target, file);
+	                    copyFileStructure(srcFile, destFile);
+	                }
+	            } else {
+	                InputStream in = new FileInputStream(source);
+	                OutputStream out = new FileOutputStream(target);
+	                byte[] buffer = new byte[1024];
+	                int length;
+	                while ((length = in.read(buffer)) > 0)
+	                    out.write(buffer, 0, length);
+	                in.close();
+	                out.close();
+	            }
+	        }
+	    } catch (IOException e) {
+	        throw new RuntimeException(e);
+	    }
 	}
 	
-	boolean deleteDirectory(File directoryToBeDeleted) {
+	private boolean deleteDirectory(File directoryToBeDeleted) {
 	    File[] allContents = directoryToBeDeleted.listFiles();
 	    if (allContents != null) {
 	        for (File file : allContents) {