Răsfoiți Sursa

File management: using of child pathname instead of string combination

RedstoneFuture 2 ani în urmă
părinte
comite
7686066ed7

+ 3 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Config.java

@@ -203,7 +203,7 @@ public class Config {
     }
 
     public static String getArenasFolder() {
-        return cfg.getString("arenas.folder") + "/";
+        return cfg.getString("arenas.folder");
     }
 
     public static boolean isMultipleLobbies() {
@@ -211,7 +211,7 @@ public class Config {
     }
 
     public static String getLobbiesFolder() {
-        return cfg.getString("lobbies.folder") + "/";
+        return cfg.getString("lobbies.folder");
     }
 
     public static String getDefaultLobby() {
@@ -219,7 +219,7 @@ public class Config {
     }
 
     public static String getMissilesFolder() {
-        return cfg.getString("missiles.folder") + "/";
+        return cfg.getString("missiles.folder");
     }
 
     public static int getReplaceTicks() {

+ 4 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/GameManager.java

@@ -59,7 +59,8 @@ public class GameManager {
         if (Config.isMultipleLobbies()) {
             lobbyFiles = new File(Config.getLobbiesFolder()).listFiles();
         } else {
-            File file = new File(Config.getLobbiesFolder() + Config.getDefaultLobby());
+            File lobbiesFolder = new File(Config.getLobbiesFolder());
+            File file = new File(lobbiesFolder, Config.getDefaultLobby());
             if (file.exists()) {
                 lobbyFiles = new File[]{file};
             }
@@ -68,7 +69,8 @@ public class GameManager {
 
         if (lobbyFiles.length == 0) {
             Logger.WARN.log("No lobby configs found. Creating default one");
-            File file = new File(Config.getLobbiesFolder() + Config.getDefaultLobby());
+            File lobbiesFolder = new File(Config.getLobbiesFolder());
+            File file = new File(lobbiesFolder, Config.getDefaultLobby());
             try {
                 file.createNewFile();
                 Serializer.serialize(file, new Lobby());

+ 2 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/GameWorld.java

@@ -121,7 +121,8 @@ public class GameWorld {
                 i++;
             } while (file.exists() || file.isDirectory());
 
-            File newFile = new File(Config.getArenasFolder() + templateName);
+            File arenasFolder = new File(Config.getArenasFolder());
+            File newFile = new File(arenasFolder, templateName);
 
             try {
                 FileUtils.copyDirectory(newFile, file);

+ 2 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/missile/Missile.java

@@ -84,7 +84,8 @@ public class Missile {
     }
 
     public File getSchematic() {
-        File file = new File(Config.getMissilesFolder() + getSchematicName(false));
+        File missilesFolder = new File(Config.getMissilesFolder());
+        File file = new File(missilesFolder, getSchematicName(false));
         return file;
     }
 

+ 2 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/SetupUtil.java

@@ -108,7 +108,8 @@ public class SetupUtil {
     }
 
     public static void checkMap(String worldName) {
-        File file = new File(Config.getArenasFolder() + worldName);
+        File arenasFolder = new File(Config.getArenasFolder());
+        File file = new File(arenasFolder, worldName);
         if (!file.isDirectory()) {
             String resource = "MissileWars-Arena.zip";