diff --git a/core/src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java b/core/src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java index 55fb8279..76c8605f 100644 --- a/core/src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java +++ b/core/src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java @@ -52,6 +52,10 @@ public class ReloadCommand extends DCommand { @Override public void onExecute(String[] args, CommandSender sender) { + if (plugin.isLoadingWorld()) { + MessageUtil.sendMessage(sender, DMessage.CMD_RELOAD_FAIL.getMessage()); + return; + } if (args.length >= 2 && (args[1].equalsIgnoreCase("-caliburn") || args[1].equalsIgnoreCase("-c"))) { plugin.getCaliburn().reload(); MessageUtil.sendCenteredMessage(sender, DMessage.CMD_RELOAD_SUCCESS.getMessage()); diff --git a/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java b/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java index 0b72ecc2..8ccdd5ca 100644 --- a/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java +++ b/core/src/main/java/de/erethon/dungeonsxl/config/DMessage.java @@ -89,6 +89,7 @@ public enum DMessage implements Message { CMD_PLAY_HELP("cmd.play.help"), CMD_RELOAD_BUTTON_CALIBURN("cmd.reload.buttonCaliburn"), CMD_RELOAD_CALIBURN("cmd.reload.caliburn"), + CMD_RELOAD_FAIL("cmd.reload.fail"), CMD_RELOAD_HELP("cmd.reload.help"), CMD_RELOAD_SUCCESS("cmd.reload.success"), CMD_RELOAD_PLAYERS("cmd.reload.players"), diff --git a/core/src/main/resources/languages/english.yml b/core/src/main/resources/languages/english.yml index 4246a4d8..9f6f874a 100644 --- a/core/src/main/resources/languages/english.yml +++ b/core/src/main/resources/languages/english.yml @@ -93,6 +93,7 @@ cmd: reload: buttonCaliburn: "&9[ RELOAD CALIBURN CONTENT ]" caliburn: "&eCustom Items: &o[&v1] &eMobs: &o[&v2] &eLoot Tables: &o[&v3]" + fail: "&4You cannot reload right now." help: "/dxl reload - Reloads the plugin" players: "&4Warning: If you reload the plugin, all players will be kicked out of their game." success: "&7Successfully reloaded DungeonsXL." diff --git a/core/src/main/resources/languages/french.yml b/core/src/main/resources/languages/french.yml index 3b53e092..8b3d83f7 100644 --- a/core/src/main/resources/languages/french.yml +++ b/core/src/main/resources/languages/french.yml @@ -93,8 +93,9 @@ cmd: reload: buttonCaliburn: "&9[ RECHARGE LES CONTENUES DE CALIBURN ]" caliburn: "&eItems personnalisés:&o[&v1] &eMobs:&o[&v2] &eTableaux Loot:&o[&v3]" + fail: "&4Vous ne pouvez pas recharger maintenant." help: "/dxl reload - Recharge le plugin" - players: "&4Attention:Si vous rechargez le plugin, tous les joueurs seront éjectés de leur jeu." + players: "&4Attention: Si vous rechargez le plugin, tous les joueurs seront éjectés de leur jeu." success: "&7DungeonsXL a été rechargé avec succès." rename: help: "/dxl rename [old name] [new name] - Change le nom de la carte en un nouveau. Cette commande NE casse PAS les donjons comportant cette carte." diff --git a/core/src/main/resources/languages/german.yml b/core/src/main/resources/languages/german.yml index 8a18de04..61b0cdc9 100644 --- a/core/src/main/resources/languages/german.yml +++ b/core/src/main/resources/languages/german.yml @@ -93,9 +93,10 @@ cmd: reload: buttonCaliburn: "&9[ CALIBURN-INHALTE NEU LADEN ]" caliburn: "&eBenutzerdefinierte Items:&o[&v1] &eMobs:&o[&v2] &eLoottabellen:&o[&v3]" + fail: "&4Du kannst gerade nicht neu laden." help: "/dxl reload - Lädt das Plugin neu" - players: "&4Warnung:Wenn Du das Plugin neu lädst, werden alle Spieler aus ihrem Spiel geworfen." - success: "&7DungeonsXL wurde erfolgreich neugeladen." + players: "&4Warnung: Wenn Du das Plugin neu lädst, werden alle Spieler aus ihrem Spiel geworfen." + success: "&7DungeonsXL wurde erfolgreich neu geladen." rename: help: "/dxl rename [old name] [new name] - Ändert den Namen des Dungeons in einen neuen. Dieser Befehl updatet auch Namensreferenzen zu dem Dungeon" success: "&4&v1&6 wurde erfolgreich zu &4&v2&6 umbenannt."