TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-24 06:23:59 +00:00
Code Issues Projects Releases Wiki Activity

#571 test jailing offline players. Person needs to have visited the server at least once and have a players.yml file

Browse source
This commit is contained in:
ementalo 2011-07-07 21:05:08 +01:00
parent 4d3e8332a8
commit ce14779d2b
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
View file

@ -22,8 +22,12 @@ public class Commandtogglejail extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
User p = getPlayer(server, args, 0); User p = getPlayer(server, args, 0, true);
if(p == null)
{
}
if (p.isAuthorized("essentials.jail.exempt")) if (p.isAuthorized("essentials.jail.exempt"))
{ {
sender.sendMessage(Util.i18n("mayNotJail")); sender.sendMessage(Util.i18n("mayNotJail"));

17
Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
View file

@ -22,7 +22,7 @@ public abstract class EssentialsCommand implements IEssentialsCommand
{ {
this.name = name; this.name = name;
} }
public void setEssentials(IEssentials ess) public void setEssentials(IEssentials ess)
{ {
this.ess = ess; this.ess = ess;
@ -34,10 +34,23 @@ public abstract class EssentialsCommand implements IEssentialsCommand
} }
protected User getPlayer(Server server, String[] args, int pos) throws NoSuchFieldException, NotEnoughArgumentsException protected User getPlayer(Server server, String[] args, int pos) throws NoSuchFieldException, NotEnoughArgumentsException
{
return getPlayer(server, args, pos, false);
}
protected User getPlayer(Server server, String[] args, int pos, boolean getOffline) throws NoSuchFieldException, NotEnoughArgumentsException
{ {
if (args.length <= pos) throw new NotEnoughArgumentsException(); if (args.length <= pos) throw new NotEnoughArgumentsException();
List<Player> matches = server.matchPlayer(args[pos]); List<Player> matches = server.matchPlayer(args[pos]);
if (matches.size() < 1) throw new NoSuchFieldException(Util.i18n("playerNotFound"));
if (matches.size() < 1)
{
if (!getOffline) throw new NoSuchFieldException(Util.i18n("playerNotFound"));
User u = ess.getOfflineUser(args[pos]);
if (u == null) throw new NoSuchFieldException(Util.i18n("playerNotFound"));
return u;
}
for (Player p : matches) for (Player p : matches)
{ {
if (p.getDisplayName().startsWith(args[pos])) if (p.getDisplayName().startsWith(args[pos]))