Worked a little more on cell creation, no longer have to provide a cell
name and when that happens we give it one ourself.
This commit is contained in:
parent
3643627b7d
commit
0272a3a241
@ -12,11 +12,11 @@ import com.graywolf336.jail.command.CommandInfo;
|
|||||||
|
|
||||||
@CommandInfo(
|
@CommandInfo(
|
||||||
maxArgs = 2,
|
maxArgs = 2,
|
||||||
minimumArgs = 2,
|
minimumArgs = 1,
|
||||||
needsPlayer = true,
|
needsPlayer = true,
|
||||||
pattern = "jailcreatecells|jcc",
|
pattern = "jailcreatecells|jcc",
|
||||||
permission = "jail.command.jailcreatecells",
|
permission = "jail.command.jailcreatecells",
|
||||||
usage = "/jailcellcreate [jail] [cellname]"
|
usage = "/jailcellcreate [jail] (cellname)"
|
||||||
)
|
)
|
||||||
public class CellCreateCommand implements Command {
|
public class CellCreateCommand implements Command {
|
||||||
|
|
||||||
@ -24,7 +24,12 @@ public class CellCreateCommand implements Command {
|
|||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
String name = player.getName();
|
String name = player.getName();
|
||||||
String jail = args[0].toLowerCase();
|
String jail = args[0].toLowerCase();
|
||||||
String cell = args[1];
|
String cell = "";
|
||||||
|
|
||||||
|
//Only get the cell name they provide if they provide it
|
||||||
|
if(args.length >= 2) {
|
||||||
|
cell = args[1];
|
||||||
|
}
|
||||||
|
|
||||||
//Check if the player is currently creating something else
|
//Check if the player is currently creating something else
|
||||||
if(jm.isCreatingSomething(name)) {
|
if(jm.isCreatingSomething(name)) {
|
||||||
@ -38,6 +43,9 @@ public class CellCreateCommand implements Command {
|
|||||||
//Not creating anything, so let them create some cells.
|
//Not creating anything, so let them create some cells.
|
||||||
if(jm.isValidJail(jail)) {
|
if(jm.isValidJail(jail)) {
|
||||||
Jail j = jm.getJail(jail);
|
Jail j = jm.getJail(jail);
|
||||||
|
|
||||||
|
//If they didn't provide a cell name, let's provide one ourself.
|
||||||
|
if(cell.isEmpty()) cell = "cell_n" + (j.getCellCount() + 1);
|
||||||
Cell c = j.getCell(cell);
|
Cell c = j.getCell(cell);
|
||||||
|
|
||||||
//No cell found
|
//No cell found
|
||||||
|
@ -115,7 +115,9 @@ public class CellCreationSteps {
|
|||||||
player.sendMessage(ChatColor.GREEN + "Chest selected.");
|
player.sendMessage(ChatColor.GREEN + "Chest selected.");
|
||||||
player.sendMessage(ChatColor.AQUA + "----------------------------------------");
|
player.sendMessage(ChatColor.AQUA + "----------------------------------------");
|
||||||
}else {
|
}else {
|
||||||
|
player.sendMessage(ChatColor.RED + "---------- Jail Cell Creation ----------");
|
||||||
player.sendMessage(ChatColor.RED + "Chest must be a double chest, chest not selected");
|
player.sendMessage(ChatColor.RED + "Chest must be a double chest, chest not selected");
|
||||||
|
player.sendMessage(ChatColor.RED + "----------------------------------------");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
|
Loading…
Reference in New Issue
Block a user