Skip to content

Commit 364c879

Browse files
authored
Add @s and @p selector support (#6110)
Adds support for @s and @p player selectors (which both select the source player). Closes #5925 Partially Addresses #6006
1 parent 427f60e commit 364c879

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

Essentials/src/main/java/com/earth2me/essentials/Essentials.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,10 @@ public User matchUser(final Server server, final User sourceUser, final String s
957957
final User user;
958958
Player exPlayer;
959959

960+
if (sourceUser != null && (searchTerm.equals("@p") || searchTerm.equals("@s"))) {
961+
return sourceUser;
962+
}
963+
960964
try {
961965
exPlayer = server.getPlayer(UUID.fromString(searchTerm));
962966
} catch (final IllegalArgumentException ex) {

Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ protected void loopOfflinePlayersConsumer(final Server server, final CommandSour
2828
throw new PlayerNotFoundException();
2929
}
3030

31+
if (sender.isPlayer() && (searchTerm.equals("@s") || searchTerm.equals("@p"))) {
32+
userConsumer.accept((User) sender.getUser());
33+
return;
34+
}
35+
3136
final UUID uuid = StringUtil.toUUID(searchTerm);
3237
if (uuid != null) {
3338
final User matchedUser = ess.getUser(uuid);
@@ -78,6 +83,11 @@ protected void loopOnlinePlayersConsumer(final Server server, final CommandSourc
7883
throw new PlayerNotFoundException();
7984
}
8085

86+
if (sender.isPlayer() && (searchTerm.equals("@s") || searchTerm.equals("@p"))) {
87+
userConsumer.accept((User) sender.getUser());
88+
return;
89+
}
90+
8191
final boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).canInteractVanished();
8292

8393
if (matchWildcards && (searchTerm.contentEquals("**") || searchTerm.contentEquals("*"))) {

0 commit comments

Comments
 (0)