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

This commit is contained in:
droppinganvil 2020-04-26 12:54:03 -05:00
commit 69a4651e23
2 changed files with 5 additions and 3 deletions

View File

@ -4,7 +4,7 @@
<groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId>
<version>1.6.9.5-2.3.4-RC</version>
<version>1.6.9.5-2.3.5-RC</version>
<packaging>jar</packaging>
<name>SaberFactions</name>

View File

@ -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);