Upstream/ChestsPlusPlus
1
0
Fork 0
mirror of https://github.com/JamesPeters98/ChestsPlusPlus.git synced 2025-01-10 10:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Command Fix

Browse Source 
Invalid command arguments caused a crash
This commit is contained in:
jameslfc19 2020-07-26 19:58:55 +01:00
parent e12bc92019
commit cc18166743
2 changed files with 188 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java
View File

@ -67,50 +67,52 @@ public class AutoCraftCommand extends ServerCommand {
Player player = (Player) sender; Player player = (Player) sender;
if(args != null && args.length > 0) { if(args != null && args.length > 0) {
switch (OPTIONS.valueOf(args[0].toUpperCase())){ try {
case HELP: switch (OPTIONS.valueOf(args[0].toUpperCase())) {
for(OPTIONS option : OPTIONS.values()){ case HELP:
if(!option.equals(OPTIONS.HELP)) { for (OPTIONS option : OPTIONS.values()) {
player.sendMessage(ChatColor.RED + option.commandHelp); if (!option.equals(OPTIONS.HELP)) {
player.sendMessage(ChatColor.WHITE + option.description); player.sendMessage(ChatColor.RED + option.commandHelp);
} player.sendMessage(ChatColor.WHITE + option.description);
} }
return true; }
case ADD: return true;
if(args.length > 1){ case ADD:
if (player.hasPermission(Permissions.AUTOCRAFT_ADD) && !Settings.isBlacklistedWorld(player.getWorld())) { if (args.length > 1) {
Block targetBlock = player.getTargetBlockExact(5); if (player.hasPermission(Permissions.AUTOCRAFT_ADD) && !Settings.isBlacklistedWorld(player.getWorld())) {
if (targetBlock != null) Config.getAutoCraft().createStorage(player, targetBlock, args[1],true); Block targetBlock = player.getTargetBlockExact(5);
else Config.getAutoCraft().getMessages().mustLookAtBlock(player); if (targetBlock != null)
} else { Config.getAutoCraft().createStorage(player, targetBlock, args[1], true);
Messages.NO_PERMISSION(player); else Config.getAutoCraft().getMessages().mustLookAtBlock(player);
} } else {
return true; Messages.NO_PERMISSION(player);
} else {
player.sendMessage(ChatColor.RED+ OPTIONS.ADD.commandHelp);
player.sendMessage(ChatColor.RED+ OPTIONS.ADD.description);
return true;
}
case OPEN:
if(args.length > 1){
if(sender.hasPermission(Permissions.AUTOCRAFT_OPEN) && sender.hasPermission(Permissions.AUTOCRAFT_OPEN_REMOTE) && !Settings.isBlacklistedWorld(player.getWorld())) {
AutoCraftingStorage invs;
if(args[1].contains(":")){
invs = Config.getAutoCraft().getStorage(player,args[1]);
} else {
invs = Config.getAutoCraft().getStorage(player.getUniqueId(), args[1]);
} }
if(invs != null) player.openInventory(invs.getInventory());
return true; return true;
} else { } else {
Messages.NO_PERMISSION(player); player.sendMessage(ChatColor.RED + OPTIONS.ADD.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.ADD.description);
return true;
}
case OPEN:
if (args.length > 1) {
if (sender.hasPermission(Permissions.AUTOCRAFT_OPEN) && sender.hasPermission(Permissions.AUTOCRAFT_OPEN_REMOTE) && !Settings.isBlacklistedWorld(player.getWorld())) {
AutoCraftingStorage invs;
if (args[1].contains(":")) {
invs = Config.getAutoCraft().getStorage(player, args[1]);
} else {
invs = Config.getAutoCraft().getStorage(player.getUniqueId(), args[1]);
}
if (invs != null) player.openInventory(invs.getInventory());
return true;
} else {
Messages.NO_PERMISSION(player);
return true;
}
} else {
player.sendMessage(ChatColor.RED + OPTIONS.OPEN.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.OPEN.description);
return true; return true;
} }
} else {
player.sendMessage(ChatColor.RED+ OPTIONS.OPEN.commandHelp);
player.sendMessage(ChatColor.RED+ OPTIONS.OPEN.description);
return true;
}
// case MENU: // case MENU:
// if(sender.hasPermission(Permissions.MENU)) { // if(sender.hasPermission(Permissions.MENU)) {
// //TODO Add AutoCraft menu. // //TODO Add AutoCraft menu.
@ -121,53 +123,56 @@ public class AutoCraftCommand extends ServerCommand {
// Messages.NO_PERMISSION(player); // Messages.NO_PERMISSION(player);
// return true; // return true;
// } // }
case LIST: case LIST:
Config.getAutoCraft().getMessages().listStorageGroups(player); Config.getAutoCraft().getMessages().listStorageGroups(player);
return true; return true;
case REMOVE: case REMOVE:
if(args.length > 1) { if (args.length > 1) {
if (sender.hasPermission(Permissions.AUTOCRAFT_REMOVE)) { if (sender.hasPermission(Permissions.AUTOCRAFT_REMOVE)) {
Config.getAutoCraft().removeStorage(player, args[1]); Config.getAutoCraft().removeStorage(player, args[1]);
return true; return true;
} else {
Messages.NO_PERMISSION(player);
return true;
}
} else { } else {
Messages.NO_PERMISSION(player); player.sendMessage(ChatColor.RED + OPTIONS.REMOVE.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.REMOVE.description);
return true;
}
case MEMBER:
return memberCommand(args, sender);
case SETPUBLIC: {
if (args.length > 2) {
AutoCraftingStorage storage = Config.getAutoCraft().getStorage(player.getUniqueId(), args[1]);
if (storage != null) {
boolean setPublic = Boolean.parseBoolean(args[2]);
storage.setPublic(setPublic);
storage.getStorageType().getMessages().setPublic(player, storage);
return true;
} else {
Bukkit.broadcastMessage("Storage null");
}
} else {
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.description);
return true; return true;
} }
} else {
player.sendMessage(ChatColor.RED+ OPTIONS.REMOVE.commandHelp);
player.sendMessage(ChatColor.RED+ OPTIONS.REMOVE.description);
return true;
} }
case MEMBER: case RENAME: {
return memberCommand(args, sender); if (args.length > 2) {
case SETPUBLIC: { String group = args[1];
if (args.length > 2) { String newIdentifier = args[2];
AutoCraftingStorage storage = Config.getAutoCraft().getStorage(player.getUniqueId(), args[1]); if (!Config.getAutoCraft().renameStorage(player, group, newIdentifier)) {
if (storage != null) { player.sendMessage(ChatColor.RED + OPTIONS.RENAME.commandHelp);
boolean setPublic = Boolean.parseBoolean(args[2]); player.sendMessage(ChatColor.RED + OPTIONS.RENAME.description);
storage.setPublic(setPublic); }
storage.getStorageType().getMessages().setPublic(player, storage);
return true; return true;
} else {
Bukkit.broadcastMessage("Storage null");
} }
} else {
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.description);
return true;
}
}
case RENAME: {
if(args.length > 2){
String group = args[1];
String newIdentifier = args[2];
if(!Config.getAutoCraft().renameStorage(player,group,newIdentifier)){
player.sendMessage(ChatColor.RED + OPTIONS.RENAME.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.RENAME.description);
}
return true;
} }
} }
} catch (IllegalArgumentException exception){
return false;
} }
} }

205
ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/ChestLinkCommand.java
View File

@ -70,125 +70,130 @@ public class ChestLinkCommand extends ServerCommand {
Player player = (Player) sender; Player player = (Player) sender;
if(args != null && args.length > 0) { if(args != null && args.length > 0) {
switch (OPTIONS.valueOf(args[0].toUpperCase())){ try {
case HELP: switch (OPTIONS.valueOf(args[0].toUpperCase())) {
for(OPTIONS option : OPTIONS.values()){ case HELP:
if(!option.equals(OPTIONS.HELP)) { for (OPTIONS option : OPTIONS.values()) {
player.sendMessage(ChatColor.RED + option.commandHelp); if (!option.equals(OPTIONS.HELP)) {
player.sendMessage(ChatColor.WHITE + option.description); player.sendMessage(ChatColor.RED + option.commandHelp);
player.sendMessage(ChatColor.WHITE + option.description);
}
} }
}
return true;
case ADD:
if(args.length > 1){
if(sender.hasPermission(Permissions.ADD) && !Settings.isBlacklistedWorld(player.getWorld())) {
Block targetBlock = player.getTargetBlockExact(5);
if (targetBlock != null) Config.getChestLink().createStorage(player,targetBlock,args[1],true);
else Config.getChestLink().getMessages().mustLookAtBlock(player);
return true;
} else {
Messages.NO_PERMISSION(player);
return true;
}
} else {
player.sendMessage(ChatColor.RED+OPTIONS.ADD.commandHelp);
player.sendMessage(ChatColor.RED+OPTIONS.ADD.description);
return true; return true;
} case ADD:
case OPEN: if (args.length > 1) {
if(args.length > 1){ if (sender.hasPermission(Permissions.ADD) && !Settings.isBlacklistedWorld(player.getWorld())) {
if(sender.hasPermission(Permissions.OPEN) && sender.hasPermission(Permissions.OPEN_REMOTE) && !Settings.isBlacklistedWorld(player.getWorld())) { Block targetBlock = player.getTargetBlockExact(5);
ChestLinkStorage invs; if (targetBlock != null)
if(args[1].contains(":")){ Config.getChestLink().createStorage(player, targetBlock, args[1], true);
invs = Config.getChestLink().getStorage(player,args[1]); else Config.getChestLink().getMessages().mustLookAtBlock(player);
return true;
} else { } else {
invs = Config.getChestLink().getStorage(player.getUniqueId(), args[1]); Messages.NO_PERMISSION(player);
return true;
} }
if(invs != null) Utils.openChestInventory(player, invs.getInventory()); } else {
player.sendMessage(ChatColor.RED + OPTIONS.ADD.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.ADD.description);
return true;
}
case OPEN:
if (args.length > 1) {
if (sender.hasPermission(Permissions.OPEN) && sender.hasPermission(Permissions.OPEN_REMOTE) && !Settings.isBlacklistedWorld(player.getWorld())) {
ChestLinkStorage invs;
if (args[1].contains(":")) {
invs = Config.getChestLink().getStorage(player, args[1]);
} else {
invs = Config.getChestLink().getStorage(player.getUniqueId(), args[1]);
}
if (invs != null) Utils.openChestInventory(player, invs.getInventory());
return true;
} else {
Messages.NO_PERMISSION(player);
return true;
}
} else {
player.sendMessage(ChatColor.RED + OPTIONS.OPEN.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.OPEN.description);
return true;
}
case MENU:
if (sender.hasPermission(Permissions.MENU) && !Settings.isBlacklistedWorld(player.getWorld())) {
ChestLinkMenu.getMenu(player).open(player);
return true; return true;
} else { } else {
Messages.NO_PERMISSION(player); Messages.NO_PERMISSION(player);
return true; return true;
} }
} else { case LIST:
player.sendMessage(ChatColor.RED+OPTIONS.OPEN.commandHelp); Config.getChestLink().getMessages().listStorageGroups(player);
player.sendMessage(ChatColor.RED+OPTIONS.OPEN.description);
return true; return true;
} case REMOVE:
case MENU: if (args.length > 1) {
if(sender.hasPermission(Permissions.MENU) && !Settings.isBlacklistedWorld(player.getWorld())) { if (sender.hasPermission(Permissions.REMOVE)) {
ChestLinkMenu.getMenu(player).open(player); Config.getChestLink().removeStorage(player, args[1]);
return true; return true;
} else { } else {
Messages.NO_PERMISSION(player); Messages.NO_PERMISSION(player);
return true; return true;
} }
case LIST:
Config.getChestLink().getMessages().listStorageGroups(player);
return true;
case REMOVE:
if(args.length > 1) {
if (sender.hasPermission(Permissions.REMOVE)) {
Config.getChestLink().removeStorage(player, args[1]);
return true;
} else { } else {
Messages.NO_PERMISSION(player); player.sendMessage(ChatColor.RED + OPTIONS.REMOVE.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.REMOVE.description);
return true;
}
case SORT:
if (args.length > 1) {
if (sender.hasPermission(Permissions.SORT)) {
ChestLinkStorage storage = Config.getChestLink().getStorage(player.getUniqueId(), args[1]);
if (storage != null) {
storage.setSortMethod(Enum.valueOf(SortMethod.class, args[2]));
storage.sort();
Messages.SORT(player, storage);
}
return true;
} else {
Messages.NO_PERMISSION(player);
return true;
}
} else {
player.sendMessage(ChatColor.RED + OPTIONS.SORT.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.SORT.description);
return true;
}
case MEMBER:
return memberCommand(args, sender);
case SETPUBLIC: {
if (args.length > 2) {
ChestLinkStorage storage = Config.getChestLink().getStorage(player.getUniqueId(), args[1]);
if (storage != null) {
boolean setpublic = Boolean.parseBoolean(args[2]);
storage.setPublic(setpublic);
storage.getStorageType().getMessages().setPublic(player, storage);
return true;
} else {
Bukkit.broadcastMessage("Storage null");
}
} else {
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.description);
return true; return true;
} }
} else {
player.sendMessage(ChatColor.RED+OPTIONS.REMOVE.commandHelp);
player.sendMessage(ChatColor.RED+OPTIONS.REMOVE.description);
return true;
} }
case SORT: case RENAME: {
if(args.length > 1) { if (args.length > 2) {
if (sender.hasPermission(Permissions.SORT)) { String group = args[1];
ChestLinkStorage storage = Config.getChestLink().getStorage(player.getUniqueId(),args[1]); String newIdentifier = args[2];
if(storage != null) { if (!Config.getChestLink().renameStorage(player, group, newIdentifier)) {
storage.setSortMethod(Enum.valueOf(SortMethod.class, args[2])); player.sendMessage(ChatColor.RED + OPTIONS.RENAME.commandHelp);
storage.sort(); player.sendMessage(ChatColor.RED + OPTIONS.RENAME.description);
Messages.SORT(player,storage);
} }
return true; return true;
} else {
Messages.NO_PERMISSION(player);
return true;
} }
} else {
player.sendMessage(ChatColor.RED+OPTIONS.SORT.commandHelp);
player.sendMessage(ChatColor.RED+OPTIONS.SORT.description);
return true;
}
case MEMBER:
return memberCommand(args, sender);
case SETPUBLIC: {
if (args.length > 2) {
ChestLinkStorage storage = Config.getChestLink().getStorage(player.getUniqueId(), args[1]);
if (storage != null) {
boolean setpublic = Boolean.parseBoolean(args[2]);
storage.setPublic(setpublic);
storage.getStorageType().getMessages().setPublic(player, storage);
return true;
} else {
Bukkit.broadcastMessage("Storage null");
}
} else {
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.SETPUBLIC.description);
return true;
}
}
case RENAME: {
if(args.length > 2){
String group = args[1];
String newIdentifier = args[2];
if(!Config.getChestLink().renameStorage(player,group,newIdentifier)){
player.sendMessage(ChatColor.RED + OPTIONS.RENAME.commandHelp);
player.sendMessage(ChatColor.RED + OPTIONS.RENAME.description);
}
return true;
} }
} }
} catch (IllegalArgumentException exception){
return false;
} }
} }