diff options
11 files changed, 55 insertions, 28 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java index 1c9e5ea16..f42676942 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.User; +import org.bukkit.command.CommandSender; import org.bukkit.Server; @@ -25,6 +26,20 @@ public class Commandafk extends EssentialsCommand toggleAfk(user); } } + + @Override + public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception + { + if (args.length > 0) + { + User afkUser = getPlayer(server, args, 0, true, false); + toggleAfk(afkUser); + } + else + { + throw new NotEnoughArgumentsException(); + } + } private void toggleAfk(User user) { @@ -53,3 +68,4 @@ public class Commandafk extends EssentialsCommand } } } + diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java index 5f521fa25..5ca434fc6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java @@ -82,7 +82,7 @@ public class Commandclearinventory extends EssentialsCommand } } - private void cleanInventoryOthers(Server server, CommandSender user, String[] args) throws Exception + private void cleanInventoryOthers(Server server, CommandSender sender, String[] args) throws Exception { List<Player> online = server.matchPlayer(args[0]); @@ -98,7 +98,7 @@ public class Commandclearinventory extends EssentialsCommand { p.getInventory().clear(); } - user.sendMessage(_("inventoryClearedOthers", p.getDisplayName())); + sender.sendMessage(_("inventoryClearedOthers", p.getDisplayName())); } } else diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java index 34aacdd53..2ccc46b02 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java @@ -73,7 +73,7 @@ public class Commandlist extends EssentialsCommand { continue; } - final String group = onlineUser.getGroup().toLowerCase(); + final String group = Util.stripFormat(onlineUser.getGroup().toLowerCase()); List<User> list = playerList.get(group); if (list == null) { @@ -99,8 +99,8 @@ public class Commandlist extends EssentialsCommand { throw new Exception(_("groupDoesNotExist")); } - - return outputFormat(groupName, listUsers(users)); + + return outputFormat(groupName, listUsers(users)); } // Handle the merging of groups @@ -140,10 +140,10 @@ public class Commandlist extends EssentialsCommand List<String> asterisk = new ArrayList<String>(); // Loop through the custom defined groups and display them - for (String configGroup : configGroups) + for (String oConfigGroup : configGroups) { - String groupValue = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim(); - configGroup = configGroup.toLowerCase(); + String groupValue = ess.getSettings().getListGroupConfig().get(oConfigGroup).toString().trim(); + String configGroup = oConfigGroup.toLowerCase(); // If the group value is an asterisk, then skip it, and handle it later if (groupValue.equals("*")) @@ -171,12 +171,13 @@ public class Commandlist extends EssentialsCommand outputUserList.addAll(matchedList); int limit = Integer.parseInt(groupValue); if (matchedList.size() > limit) - { - sender.sendMessage(outputFormat(configGroup, _("groupNumber", matchedList.size(), commandLabel, configGroup))); + { + sender.sendMessage(outputFormat(oConfigGroup, _("groupNumber", matchedList.size(), commandLabel, Util.stripFormat(configGroup)))); + } + else + { + sender.sendMessage(outputFormat(oConfigGroup, listUsers(outputUserList))); } - else { - sender.sendMessage(outputFormat(configGroup, listUsers(outputUserList))); - } continue; } } @@ -189,7 +190,7 @@ public class Commandlist extends EssentialsCommand continue; } - sender.sendMessage(outputFormat(configGroup, listUsers(outputUserList))); + sender.sendMessage(outputFormat(oConfigGroup, listUsers(outputUserList))); } String[] onlineGroups = playerList.keySet().toArray(new String[0]); @@ -200,7 +201,7 @@ public class Commandlist extends EssentialsCommand { List<User> asteriskUsers = new ArrayList<User>(); for (String onlineGroup : onlineGroups) - { + { asteriskUsers.addAll(playerList.get(onlineGroup)); } for (String key : asterisk) @@ -218,12 +219,12 @@ public class Commandlist extends EssentialsCommand if (ess.getPermissionsHandler().getName().equals("ConfigPermissions")) { onlineGroup = _("connectedPlayers"); - } + } if (users == null || users.isEmpty()) { continue; } - String groupName = users.get(0).getGroup(); + String groupName = users.get(0).getGroup(); sender.sendMessage(outputFormat(groupName, listUsers(users))); } } @@ -263,6 +264,6 @@ public class Commandlist extends EssentialsCommand outputString.append(_("listGroupTag", Util.replaceFormat(group))); outputString.append(message); outputString.setCharAt(0, Character.toTitleCase(outputString.charAt(0))); - return outputString.toString(); + return outputString.toString(); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java index 0957a7989..67517b7c8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java @@ -25,7 +25,8 @@ public class Commandremove extends EssentialsCommand BOATS, MINECARTS, XP, - PAINTINGS + PAINTINGS, + ITEMFRAMES } @Override @@ -155,6 +156,14 @@ public class Commandremove extends EssentialsCommand removed++; } } + else if (toRemove == ToRemove.ITEMFRAMES) + { + if (e instanceof Painting) + { + e.remove(); + removed++; + } + } } } sender.sendMessage(_("removed", removed)); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java index b0df89a67..2d91657d6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java @@ -27,7 +27,7 @@ public class Commandsudo extends EssentialsCommand throw new NotEnoughArgumentsException(); } - final User user = getPlayer(server, args, 0); + final User user = getPlayer(server, args, 0, true, false); if(args[1].toLowerCase(Locale.ENGLISH).startsWith("c:")) { if (user.isAuthorized("essentials.sudo.exempt") && sender instanceof Player) diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java index aeecf5368..55462e6bd 100644 --- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java @@ -83,8 +83,8 @@ public class EssentialsSign } try { - return (user.isAuthorized("essentials.signs." + signName.toLowerCase(Locale.ENGLISH) + ".use") - || user.isAuthorized("essentials.signs.use." + signName.toLowerCase(Locale.ENGLISH))) + return (!user.isDead() && (user.isAuthorized("essentials.signs." + signName.toLowerCase(Locale.ENGLISH) + ".use") + || user.isAuthorized("essentials.signs.use." + signName.toLowerCase(Locale.ENGLISH)))) && onSignInteract(sign, user, getUsername(user), ess); } catch (ChargeException ex) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java b/Essentials/src/com/earth2me/essentials/signs/SignHeal.java index f29032163..3005610b4 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignHeal.java @@ -24,6 +24,10 @@ public class SignHeal extends EssentialsSign @Override protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + if (player.getHealth() == 0) + { + throw new SignException(_("healDead")); + } final Trade charge = getTrade(sign, 1, ess); charge.isAffordableFor(player); player.setHealth(20); diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv index 6a7268aee..412b56fec 100644 --- a/Essentials/src/items.csv +++ b/Essentials/src/items.csv @@ -291,7 +291,6 @@ otree,17,0 olog,17,0 otrunk,17,0 owood,17,0 -dark,17,1 darktree,17,1 darklog,17,1 darktrunk,17,1 @@ -323,12 +322,10 @@ birchtree,17,2 birchlog,17,2 birchtrunk,17,2 birchwood,17,2 -white,17,2 whitetree,17,2 whitelog,17,2 whitetrunk,17,2 whitewood,17,2 -light,17,2 lighttree,17,2 lightlog,17,2 lighttrunk,17,2 diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 6f9648966..b16549480 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -135,7 +135,7 @@ giveSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1} to\u00a7c {2}\u00a76. godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0}. godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0}. godMode=\u00a76God mode\u00a7c {0}\u00a76. -groupNumber={0} online, for the full list type /{1} {2} +groupNumber=\u00a7c{0}\u00a7f online, for the full list:\u00a7c /{1} {2} groupDoesNotExist=\u00a74There's no one online in this group! hatArmor=\u00a74You cannot use this item as a hat! hatEmpty=\u00a74You are not wearing a hat. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 6f9648966..b16549480 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -135,7 +135,7 @@ giveSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1} to\u00a7c {2}\u00a76. godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0}. godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0}. godMode=\u00a76God mode\u00a7c {0}\u00a76. -groupNumber={0} online, for the full list type /{1} {2} +groupNumber=\u00a7c{0}\u00a7f online, for the full list:\u00a7c /{1} {2} groupDoesNotExist=\u00a74There's no one online in this group! hatArmor=\u00a74You cannot use this item as a hat! hatEmpty=\u00a74You are not wearing a hat. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index 0ca4e8288..c0cac55a3 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -268,7 +268,7 @@ mutedPlayerFor=\u00a77Gracz {0} \u00a77zostal wyciszony na {1}. mutedUserSpeaks={0} probowal sie odezwac, ale jest wyciszony. nearbyPlayers=\u00a77Gracze w poblizu:\u00a7r {0} negativeBalanceError=\u00a74Gracz nie moze miec ujemnego stanu konta. -nickChanged=\u00a7date6Nick zostal zmieniony. +nickChanged=\u00a77Nick zostal zmieniony. nickDisplayName=\u00a74Musisz wlaczyc change-displayname w configu Essential. nickInUse=\u00a74Ten pseudonim jest juz w uzyciu. nickNamesAlpha=\u00a74Pseudonimy musza byc alfanumeryczne. |