1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00

fix 1.8listener

Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-09-22 16:35:13 +08:00
parent 2f1aee005a
commit 28d561b21a

View File

@@ -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 {