EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add work on jailclear and also the jail command to use language string.

Browse Source
This commit is contained in:
graywolf336
2014-01-21 15:12:09 -06:00
parent 38438e2eb8
commit c956018d1e
5 changed files with 60 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/graywolf336/jail/command/commands/JailClearCommand.java
View File

@ -3,8 +3,10 @@ package com.graywolf336.jail.command.commands;
import org.bukkit.command.CommandSender;
import com.graywolf336.jail.JailManager;
import com.graywolf336.jail.beans.Jail;
import com.graywolf336.jail.command.Command;
import com.graywolf336.jail.command.CommandInfo;
import com.graywolf336.jail.enums.LangString;
@CommandInfo(
maxArgs = 1,
@ -17,8 +19,29 @@ import com.graywolf336.jail.command.CommandInfo;
public class JailClearCommand implements Command {
// If Jail is specified clear all prisoners from that Jail (new feature) else, clear all players from all jails
public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(args.length == 1) {
Jail j = jm.getJail(args[0]);
if(j != null) {
j.clearPrisoners();
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.PRISONERSCLEARED, j.getName()));
}else {
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.NOJAIL, args[0]));
}
}else {
if(jm.getJails().size() == 0) {
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.NOJAILS));
}else {
for(Jail j : jm.getJails()) {
j.clearPrisoners();
}
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.PRISONERSCLEARED,
jm.getPlugin().getJailIO().getLanguageString(LangString.ALLJAILS)));
}
}
return true; //If they made it this far, the command is intact and ready to be processed. :)
}

8
src/main/java/com/graywolf336/jail/command/commands/JailCommand.java
View File

@ -44,7 +44,7 @@ public class JailCommand implements Command {
public boolean execute(JailManager jm, CommandSender sender, String... args) {
if(jm.getJails().size() == 0) {
sender.sendMessage(ChatColor.RED + "No jails found.");
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.NOJAILS));
return true;
}
@ -59,7 +59,7 @@ public class JailCommand implements Command {
//Check if the given player is already jailed or not
if(jm.isPlayerJailed(params.player())) {
sender.sendMessage(ChatColor.RED + "That player is already jailed.");
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.ALREADYJAILED));
return true;
}
@ -75,7 +75,7 @@ public class JailCommand implements Command {
time = Util.getTime(params.time());
}
}catch(Exception e) {
sender.sendMessage(ChatColor.RED + "Number format is incorrect.");
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.NUMBERFORMATINCORRECT));
return true;
}
@ -93,7 +93,7 @@ public class JailCommand implements Command {
params.setJail(jm.getPlugin().getConfig().getString(Settings.DEFAULTJAIL.getPath()));
}
}else if(jm.getJail(params.jail()) == null) {
sender.sendMessage(ChatColor.RED + "No jail found by the name of '" + params.jail() + "'.");
sender.sendMessage(jm.getPlugin().getJailIO().getLanguageString(LangString.NOJAIL, params.jail()));
return true;
}