Fork/CitizensCMD
2
0
Fork 0
forked from Upstream/CitizensCMD
Code Pull Requests Actions Releases Activity

Fixed on disable error message spam.

Browse Source 
Changed `sound` command to `add sound`.
This commit is contained in:
Mateus 2019-02-19 02:22:20 +00:00
parent 094e7c2cd0
commit f7c9933b02
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/me/mattmoreira/citizenscmd/CitizensCMD.java
View File

@ -68,7 +68,10 @@ public final class CitizensCMD extends JavaPlugin {
public void onEnable() { public void onEnable() {
if (!hasCitizens()) Util.disablePlugin(this); if (!hasCitizens()) {
Util.disablePlugin(this);
return;
}
commandHandler = new CommandHandler(this); commandHandler = new CommandHandler(this);
commandHandler.enable(); commandHandler.enable();
@ -121,22 +124,22 @@ public final class CitizensCMD extends JavaPlugin {
if (setupEconomy()) { if (setupEconomy()) {
switch (lang.getLanguage()) { switch (lang.getLanguage()) {
case "en": case "en":
info(color(TAG + "&7Using &aVult&7!")); info(color(TAG + "&7Using &aVault&7!"));
break; break;
case "pt": case "pt":
info(color(TAG + "&7Usando &aVult&7!")); info(color(TAG + "&7Usando &aVault&7!"));
break; break;
case "ro": case "ro":
info(color(TAG + "&7Folositi &aVult&7!")); info(color(TAG + "&7Folositi &aVault&7!"));
break; break;
case "bg": case "bg":
info(color(TAG + "&7Използвайки &aVult&7!")); info(color(TAG + "&7Използвайки &aVault&7!"));
break; break;
case "no": case "no":
info(color(TAG + "&7Bruk &aVult&7!")); info(color(TAG + "&7Bruk &aVault&7!"));
break; break;
case "ch": case "ch":
info(color(TAG + "&7运用 &aVult&7!")); info(color(TAG + "&7运用 &aVault&7!"));
break; break;
} }
} }
@ -202,8 +205,10 @@ public final class CitizensCMD extends JavaPlugin {
@Override @Override
public void onDisable() { public void onDisable() {
commandHandler.disable(); if (commandHandler != null) {
cooldownHandler.saveToFile(); commandHandler.disable();
cooldownHandler.saveToFile();
}
} }
private boolean hasCitizens() { private boolean hasCitizens() {

5
src/main/java/me/mattmoreira/citizenscmd/commands/base/CommandHandler.java
View File

@ -157,6 +157,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter, IHandler {
switch (subCMD) { switch (subCMD) {
case "add": case "add":
if (args.length == 2) return getCommandNames(subCMD, args, 1, (Player) sender); if (args.length == 2) return getCommandNames(subCMD, args, 1, (Player) sender);
if (args.length == 3) return getCommandNames(subCMD, args, 2, (Player) sender);
break; break;
case "remove": case "remove":
@ -185,10 +186,6 @@ public class CommandHandler implements CommandExecutor, TabCompleter, IHandler {
return getCommandNames(subCMD, args, 5, (Player) sender); return getCommandNames(subCMD, args, 5, (Player) sender);
} }
break; break;
case "sound":
if (args.length == 2) return getCommandNames(subCMD, args, 1, (Player) sender);
break;
} }
} }

7
src/main/java/me/mattmoreira/citizenscmd/utility/Util.java
View File

@ -160,7 +160,8 @@ public class Util {
switch (subCMD.toLowerCase()) { switch (subCMD.toLowerCase()) {
case "add": case "add":
argComplete[0] = new String[]{"console", "none", "permission", "server", "message"}; argComplete[0] = new String[]{"console", "none", "permission", "server", "message", "sound"};
argComplete[1] = getSoundsList();
break; break;
case "remove": case "remove":
argComplete[0] = new String[]{"left", "right"}; argComplete[0] = new String[]{"left", "right"};
@ -174,10 +175,6 @@ public class Util {
argComplete[3] = plugin.getDataHandler().getCompleteCommandsNumbers(getSelectedNpcId(player), EnumTypes.ClickType.RIGHT); argComplete[3] = plugin.getDataHandler().getCompleteCommandsNumbers(getSelectedNpcId(player), EnumTypes.ClickType.RIGHT);
argComplete[4] = new String[]{"console", "none", "permission", "server", "message"}; argComplete[4] = new String[]{"console", "none", "permission", "server", "message"};
break; break;
case "sound":
argComplete[0] = getSoundsList();
break;
} }
return argComplete; return argComplete;
} }