Просмотр исходного кода

Put this function in a better place.

GJ 12 лет назад
Родитель
Сommit
c8c76f4174

+ 3 - 2
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java

@@ -780,9 +780,10 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         // Check if there were any errors
-        if (Misc.noErrorsInConfig(reason)) {
+        if (noErrorsInConfig(reason)) {
             mcMMO.p.debug("No errors found in " + fileName + "!");
-        } else {
+        }
+        else {
             mcMMO.p.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!");
             mcMMO.p.getServer().getPluginManager().disablePlugin(mcMMO.p);
             mcMMO.p.noErrorsInConfigFiles = false;

+ 10 - 0
src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java

@@ -7,11 +7,13 @@ import java.io.FileWriter;
 import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.metrics.MetricsManager;
 
 public abstract class AutoUpdateConfigLoader extends ConfigLoader {
@@ -125,4 +127,12 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
             }
         }
     }
+
+    protected boolean noErrorsInConfig(List<String> issues) {
+        for (String issue : issues) {
+            mcMMO.p.getLogger().warning(issue);
+        }
+
+        return issues.isEmpty();
+    }
 }

+ 1 - 1
src/main/java/com/gmail/nossr50/config/Config.java

@@ -199,7 +199,7 @@ public class Config extends AutoUpdateConfigLoader {
         }
 
         // Check if there were any errors
-        if (Misc.noErrorsInConfig(reason)) {
+        if (noErrorsInConfig(reason)) {
             mcMMO.p.debug("No errors found in " + fileName + "!");
         }
         else {

+ 0 - 8
src/main/java/com/gmail/nossr50/util/Misc.java

@@ -302,14 +302,6 @@ public final class Misc {
         return partialName;
     }
 
-    public static boolean noErrorsInConfig(List<String> issues) {
-        for (String issue : issues) {
-            mcMMO.p.getLogger().warning(issue);
-        }
-
-        return issues.isEmpty();
-    }
-
     public static Random getRandom() {
         return random;
     }