Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-11 09:51:35 +01:00
Code Issues Projects Releases Wiki Activity

Add @n selector to ArgumentEntity (#2632)

Browse Source
This commit is contained in:
ThatGravyBoat 2025-01-31 17:40:09 -03:30 committed by GitHub
parent 32735340d7
commit 87f6524aeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentEntity.java
View File

@ -32,9 +32,9 @@ public class ArgumentEntity extends Argument<EntityFinder> {
private static final Pattern USERNAME_PATTERN = Pattern.compile("[a-zA-Z0-9_]{1,16}");
private static final String SELECTOR_PREFIX = "@";
private static final List<String> SELECTOR_VARIABLES = Arrays.asList("@p", "@r", "@a", "@e", "@s");
private static final List<String> SELECTOR_VARIABLES = Arrays.asList("@p", "@r", "@a", "@e", "@s", "@n");
private static final List<String> PLAYERS_ONLY_SELECTOR = Arrays.asList("@p", "@r", "@a", "@s");
private static final List<String> SINGLE_ONLY_SELECTOR = Arrays.asList("@p", "@r", "@s");
private static final List<String> SINGLE_ONLY_SELECTOR = Arrays.asList("@p", "@r", "@s", "@n");
// List with all the valid arguments
private static final List<String> VALID_ARGUMENTS = Arrays.asList(
"x", "y", "z",
@ -297,6 +297,8 @@ public class ArgumentEntity extends Argument<EntityFinder> {
private static EntityFinder.TargetSelector toTargetSelector(@NotNull String selectorVariable) {
if (selectorVariable.equals("@p"))
return EntityFinder.TargetSelector.NEAREST_PLAYER;
if (selectorVariable.equals("@n"))
return EntityFinder.TargetSelector.NEAREST_ENTITY;
if (selectorVariable.equals("@r"))
return EntityFinder.TargetSelector.RANDOM_PLAYER;
if (selectorVariable.equals("@a"))

8
src/main/java/net/minestom/server/utils/entity/EntityFinder.java
View File

@ -283,7 +283,7 @@ public class EntityFinder {
}
public enum TargetSelector {
NEAREST_PLAYER, RANDOM_PLAYER, ALL_PLAYERS, ALL_ENTITIES, SELF, MINESTOM_USERNAME, MINESTOM_UUID
NEAREST_PLAYER, RANDOM_PLAYER, ALL_PLAYERS, ALL_ENTITIES, SELF, MINESTOM_USERNAME, MINESTOM_UUID, NEAREST_ENTITY
}
public enum EntitySort {
@ -315,6 +315,12 @@ public class EntityFinder {
return players.stream()
.min(Comparator.comparingDouble(p -> p.getPosition().distanceSquared(startPosition)))
.<List<Entity>>map(Collections::singletonList).orElse(List.of());
} else if (targetSelector == TargetSelector.NEAREST_ENTITY) {
List<Entity> entities = findTarget(instance, TargetSelector.ALL_ENTITIES, startPosition, self);
return entities.stream()
.min(Comparator.comparingDouble(p -> p.getPosition().distanceSquared(startPosition)))
.map(Collections::singletonList).orElse(List.of());
} else if (targetSelector == TargetSelector.RANDOM_PLAYER) {
final int index = ThreadLocalRandom.current().nextInt(players.size());
final Player player = players.stream().skip(index).findFirst().orElseThrow();