Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

2020-04-26 12:54:03 -05:00
parent f2c6d0b9da 8f343a5344
commit 69a4651e23
2 changed files with 5 additions and 3 deletions
--- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java
+++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java
@@ -184,8 +184,10 @@ public class FactionsPlugin extends MPlugin {
        Metrics metrics = new Metrics(this, pluginId);


-        if (!preEnable()) return;
-        this.loadSuccessful = false;
+        if (!preEnable()) {
+            this.loadSuccessful = false;
+            return;
+        }

        if (!new File(this.getDataFolder() + "/config.yml").exists()) {
            this.saveResource("config.yml", false);