Merge remote-tracking branch 'origin/1.6.x' into 1.6.x
This commit is contained in:
commit
69a4651e23
2
pom.xml
2
pom.xml
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<groupId>com.massivecraft</groupId>
|
<groupId>com.massivecraft</groupId>
|
||||||
<artifactId>Factions</artifactId>
|
<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>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>SaberFactions</name>
|
<name>SaberFactions</name>
|
||||||
|
@ -184,8 +184,10 @@ public class FactionsPlugin extends MPlugin {
|
|||||||
Metrics metrics = new Metrics(this, pluginId);
|
Metrics metrics = new Metrics(this, pluginId);
|
||||||
|
|
||||||
|
|
||||||
if (!preEnable()) return;
|
if (!preEnable()) {
|
||||||
this.loadSuccessful = false;
|
this.loadSuccessful = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!new File(this.getDataFolder() + "/config.yml").exists()) {
|
if (!new File(this.getDataFolder() + "/config.yml").exists()) {
|
||||||
this.saveResource("config.yml", false);
|
this.saveResource("config.yml", false);
|
||||||
|
Loading…
Reference in New Issue
Block a user