mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-15 11:04:29 +02:00
Make looping commands see vanished players properly
Make /r check player existence in the correct order
This commit is contained in:
@@ -44,13 +44,14 @@ public class Commandr extends EssentialsCommand
|
|||||||
}
|
}
|
||||||
|
|
||||||
final CommandSource target = replyTo.getReplyTo();
|
final CommandSource target = replyTo.getReplyTo();
|
||||||
final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME;
|
|
||||||
|
|
||||||
if (target == null || (target.isPlayer() && !target.getPlayer().isOnline()))
|
if (target == null || (target.isPlayer() && !target.getPlayer().isOnline()))
|
||||||
{
|
{
|
||||||
throw new Exception(_("foreverAlone"));
|
throw new Exception(_("foreverAlone"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final String targetName = target.isPlayer() ? target.getPlayer().getDisplayName() : Console.NAME;
|
||||||
|
|
||||||
sender.sendMessage(_("msgFormat", _("me"), targetName, message));
|
sender.sendMessage(_("msgFormat", _("me"), targetName, message));
|
||||||
if (target.isPlayer())
|
if (target.isPlayer())
|
||||||
{
|
{
|
||||||
|
@@ -116,7 +116,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
final User player = getPlayer(server, searchTerm, skipHidden, false);
|
final User player = getPlayer(server, searchTerm, !skipHidden, false);
|
||||||
updatePlayer(server, sender, player, commandArgs);
|
updatePlayer(server, sender, player, commandArgs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user