diff options
8 files changed, 19 insertions, 13 deletions
diff --git a/Essentials/src/net/ess3/api/IUserMap.java b/Essentials/src/net/ess3/api/IUserMap.java index 807489804..f98f5aa02 100644 --- a/Essentials/src/net/ess3/api/IUserMap.java +++ b/Essentials/src/net/ess3/api/IUserMap.java @@ -53,6 +53,4 @@ public interface IUserMap extends IReload public void addPrejoinedPlayer(Player player); public void removePrejoinedPlayer(Player player); - - public Object getPlayer(LivingEntity livingEntity); } diff --git a/Essentials/src/net/ess3/commands/Commandgc.java b/Essentials/src/net/ess3/commands/Commandgc.java index a79635cf7..71bc3dc1a 100644 --- a/Essentials/src/net/ess3/commands/Commandgc.java +++ b/Essentials/src/net/ess3/commands/Commandgc.java @@ -1,6 +1,8 @@ package net.ess3.commands; +import java.lang.management.ManagementFactory; import static net.ess3.I18n._; +import net.ess3.utils.DateUtil; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; @@ -25,6 +27,7 @@ public class Commandgc extends EssentialsCommand { color = ChatColor.RED; } + sender.sendMessage(_("uptime", DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime()))); sender.sendMessage(_("tps", "" + color + tps)); sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024))); sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024))); diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java index 1cbf7732c..37aecd99f 100644 --- a/Essentials/src/net/ess3/commands/Commandrealname.java +++ b/Essentials/src/net/ess3/commands/Commandrealname.java @@ -20,6 +20,7 @@ public class Commandrealname extends EssentialsCommand } final ISettings settings = ess.getSettings(); final String whois = args[0].toLowerCase(Locale.ENGLISH); + boolean foundUser = false; Player player = sender instanceof IUser ? ((IUser)sender).getPlayer() : null; for (Player onlinePlayer : server.getOnlinePlayers()) { @@ -29,13 +30,15 @@ public class Commandrealname extends EssentialsCommand continue; } final String displayName = FormatUtil.stripFormat(u.getPlayer().getDisplayName()).toLowerCase(Locale.ENGLISH); - if (!whois.equals(displayName) - && !displayName.equals(FormatUtil.stripFormat(settings.getData().getChat().getNicknamePrefix()) + whois) - && !whois.equalsIgnoreCase(u.getName())) + if (displayName.contains(whois)) { - continue; + foundUser = true; + sender.sendMessage(u.getPlayer().getDisplayName() + " " + _("is") + " " + u.getName()); } - sender.sendMessage(u.getPlayer().getDisplayName() + " " + _("is") + " " + u.getName()); + } + if (!foundUser) + { + throw new NoSuchFieldException(_("playerNotFound")); } } } diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java index 6b46106f3..48ebb0990 100644 --- a/Essentials/src/net/ess3/commands/Commandsethome.java +++ b/Essentials/src/net/ess3/commands/Commandsethome.java @@ -52,7 +52,7 @@ public class Commandsethome extends EssentialsCommand IUser usersHome = ess.getUserMap().getUser(ess.getServer().getPlayer(args[0])); if (usersHome == null) { - throw new Exception(_("playerNotFound")); + throw new NoSuchFieldException(_("playerNotFound")); } String name = args[1].toLowerCase(Locale.ENGLISH); if (!Permissions.SETHOME_MULTIPLE.isAuthorized(user)) @@ -61,7 +61,7 @@ public class Commandsethome extends EssentialsCommand } if ("bed".equals(name.toLowerCase(Locale.ENGLISH))) { - throw new NotEnoughArgumentsException(); + throw new NoSuchFieldException(_("invalidHomeName")); } usersHome.getData().addHome(name, user.getPlayer().getLocation()); diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java index 37e472abe..91d90c1a2 100644 --- a/Essentials/src/net/ess3/commands/Commandsetwarp.java +++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java @@ -4,6 +4,7 @@ import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.api.IWarps; import net.ess3.permissions.Permissions; +import net.ess3.utils.Util; import org.bukkit.Location; @@ -19,9 +20,9 @@ public class Commandsetwarp extends EssentialsCommand throw new NotEnoughArgumentsException(); } - if (args[0].matches("[0-9]+")) + if (Util.isInt(args[0])) { - throw new NotEnoughArgumentsException(); + throw new NoSuchFieldException(_("invalidWarpName")); } final Location loc = user.getPlayer().getLocation(); diff --git a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java index ae858e78e..1247f1e06 100644 --- a/Essentials/src/net/ess3/listener/EssentialsEntityListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsEntityListener.java @@ -201,7 +201,7 @@ public class EssentialsEntityListener implements Listener { if (entity instanceof Player) { - User user = (User)ess.getUserMap().getPlayer(entity); + User user = (User)ess.getUserMap().getUser((Player)event.getEntity()); if (user.isGodModeEnabled()) { event.setIntensity(entity, 0d); diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index 22ddcdd42..2dbf91ec2 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -10,6 +10,7 @@ import org.bukkit.permissions.PermissionDefault; public enum Permissions implements IPermission { AFK, + AFK_AUTO, AFK_KICKEXEMPT, AFK_OTHERS, BACK_ONDEATH, diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index 753069874..a1ec0d8fa 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -417,7 +417,7 @@ public class User extends UserBase implements IUser } final long autoafk = settings.getData().getCommands().getAfk().getAutoAFK(); - if (!getData().isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && Permissions.AFK.isAuthorized(this)) + if (!getData().isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && Permissions.AFK_AUTO.isAuthorized(this)) { setAfk(true); ess.broadcastMessage(this, _("userIsAway", getPlayer().getDisplayName())); |