diff --git a/src/main/java/com/bekvon/bukkit/residence/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java index 55ba5c3..3c8a5dd 100644 --- a/src/main/java/com/bekvon/bukkit/residence/Residence.java +++ b/src/main/java/com/bekvon/bukkit/residence/Residence.java @@ -312,14 +312,6 @@ public class Residence extends JavaPlugin { dataFolder = this.getDataFolder(); if (!dataFolder.isDirectory()) dataFolder.mkdirs(); - - if (!new File(dataFolder, "config.yml").isFile()) - this.writeDefaultConfigFromJar(); - if (this.getConfig().getInt("ResidenceVersion", 0) == 0) { - this.writeDefaultConfigFromJar(); - this.getConfig().load("config.yml"); - this.getLogger().warning("配置文件不存在,写入默认配置文件."); - } cmanager = new ConfigManager(this.getConfig()); String multiworld = cmanager.getMultiworldPlugin(); if (multiworld != null) { @@ -408,9 +400,9 @@ public class Residence extends JavaPlugin { PluginManager pm = getServer().getPluginManager(); pm.registerEvents(blistener, this); pm.registerEvents(plistener, this); - pm.registerEvents(plistener1_8, this); + if (is1_8()) + pm.registerEvents(plistener1_8, this); pm.registerEvents(elistener, this); - firstenable = false; } else plistener.reload(); @@ -450,7 +442,7 @@ public class Residence extends JavaPlugin { @Override public void onLoad() { - config = new FileConfig(this, "config.yml"); + config = new FileConfig(this); } @Override @@ -462,7 +454,6 @@ public class Residence extends JavaPlugin { this.onDisable(); this.reloadConfig(); this.onEnable(); - } @Override @@ -613,11 +604,6 @@ public class Residence extends JavaPlugin { this.getLogger().info(" - 保存插件数据..."); } - private void writeDefaultConfigFromJar() { - if (this.writeDefaultFileFromJar(new File(this.getDataFolder(), "config.yml"), "config.yml", true)) - this.getLogger().info("保存默认配置文件..."); - } - @SuppressWarnings("resource") private boolean writeDefaultFileFromJar(File writeName, String jarPath, boolean backupOld) { try {