diff --git a/src/com/dre/dungeonsxl/P.java b/src/com/dre/dungeonsxl/P.java index 966e765a..68f8802e 100644 --- a/src/com/dre/dungeonsxl/P.java +++ b/src/com/dre/dungeonsxl/P.java @@ -74,7 +74,7 @@ public class P extends JavaPlugin{ //Load Language language = new LanguageReader(new File(p.getDataFolder(), "languages/"+mainConfig.language+".yml")); - //Init Classes + //Init Commands new DCommandRoot(); //InitFolders @@ -117,16 +117,12 @@ public class P extends JavaPlugin{ this.log(this.getDescription().getName()+" enabled!"); } - @Override public void onDisable(){ //Save this.saveData(); language.save(); - - //MSG - this.log(this.getDescription().getName()+" disabled!"); - + //DPlayer leaves World for(DPlayer dplayer:DPlayer.players){ dplayer.leave(); @@ -153,9 +149,11 @@ public class P extends JavaPlugin{ //Stop shedulers p.getServer().getScheduler().cancelTasks(this); + + //MSG + this.log(this.getDescription().getName()+" disabled!"); } - //Init. public void initFolders(){ //Check Folder diff --git a/src/com/dre/dungeonsxl/commands/CMDReload.java b/src/com/dre/dungeonsxl/commands/CMDReload.java index 94fd061d..e83d0d34 100644 --- a/src/com/dre/dungeonsxl/commands/CMDReload.java +++ b/src/com/dre/dungeonsxl/commands/CMDReload.java @@ -1,8 +1,14 @@ package com.dre.dungeonsxl.commands; +import java.io.File; + import org.bukkit.entity.Player; +import com.dre.dungeonsxl.DMobType; +import com.dre.dungeonsxl.LanguageReader; +import com.dre.dungeonsxl.MainConfig; + public class CMDReload extends DCommand{ public CMDReload(){ @@ -15,8 +21,21 @@ public class CMDReload extends DCommand{ @Override public void onExecute(String[] args, Player player) { p.msg(player, p.language.get("Cmd_Reload_Start")); - p.onDisable(); - p.onEnable(); + + //Save + p.saveData(); + p.language.save(); + + //Load Config + p.mainConfig = new MainConfig(new File(p.getDataFolder(), "config.yml")); + + //Load Language + p.language = new LanguageReader(new File(p.getDataFolder(), "languages/"+p.mainConfig.language+".yml")); + + //Mobtype + DMobType.clear(); + DMobType.load(new File(p.getDataFolder(), "mobs.yml")); + p.msg(player, p.language.get("Cmd_Reload_Done")); } }