Ver código fonte

Removing duplicate method for deleting ZIP files

RedstoneFuture 3 anos atrás
pai
commit
ffa59c762e

+ 0 - 14
missilewars-plugin/src/main/java/de/butzlabben/missilewars/MissileWars.java

@@ -135,7 +135,6 @@ public class MissileWars extends JavaPlugin {
     @Override
     public void onDisable() {
         GameManager.getInstance().disableAll();
-        //deleteDefaultFileSource();
         deleteTempWorlds();
 
         ConnectionHolder.close();
@@ -165,19 +164,6 @@ public class MissileWars extends JavaPlugin {
         }
     }
 
-    /**
-     * This method deletes the original ZIP files from the
-     * "/MissileWars" folder. The default missiles and the
-     * default arena world was copied from these archives
-     * at the first server start.
-     */
-    private void deleteDefaultFileSource() {
-        File missiles = new File(getDataFolder(), "missiles.zip");
-        File arena = new File(getDataFolder(), "MissileWars-Arena.zip");
-        FileUtils.deleteQuietly(missiles);
-        FileUtils.deleteQuietly(arena);
-    }
-
     /**
      * This method sends information about the version, version
      * warnings (if necessary) and authors in the console.

+ 5 - 7
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/SetupUtil.java

@@ -23,12 +23,9 @@ import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.game.Arenas;
 import de.butzlabben.missilewars.wrapper.abstracts.Arena;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.*;
 import java.net.URL;
 import java.nio.file.Files;
 import java.util.Enumeration;
@@ -36,7 +33,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * @author Butzlabben
@@ -123,6 +119,8 @@ public class SetupUtil {
         Files.copy(in, out.toPath());
 
         unzip(out.getPath(), outputFolder);
+
+        // delete the ZIP files after server stopping
         out.deleteOnExit();
     }