From 97d176ea27da958898b3dcb77fe38592c80a3b58 Mon Sep 17 00:00:00 2001 From: Chris Ward Date: Sat, 19 Oct 2013 19:06:42 +1100 Subject: Make looping commands see vanished players properly Make /r check player existence in the correct order --- Essentials/src/com/earth2me/essentials/commands/Commandr.java | 3 ++- .../src/com/earth2me/essentials/commands/EssentialsLoopCommand.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index 4b4de6ff9..1a793556a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -44,13 +44,14 @@ public class Commandr extends EssentialsCommand } final CommandSource target = replyTo.getReplyTo(); - final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME; if (target == null || (target.isPlayer() && !target.getPlayer().isOnline())) { throw new Exception(_("foreverAlone")); } + final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME; + sender.sendMessage(_("msgFormat", _("me"), targetName, message)); if (target.isPlayer()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java index 2a7ebddde..c34fe8bd6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java @@ -116,7 +116,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand } else { - final User player = getPlayer(server, searchTerm, skipHidden, false); + final User player = getPlayer(server, searchTerm, !skipHidden, false); updatePlayer(server, sender, player, commandArgs); } } -- cgit v1.2.3