Actually handle entity uuids

Earthcomputer · Jul 8, 2021 · e122889 · e122889
1 parent fc78084
commit e122889
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...ain/java/net/earthcomputer/clientcommands/command/arguments/ClientEntityArgumentType.java b/...ain/java/net/earthcomputer/clientcommands/command/arguments/ClientEntityArgumentType.java
@@ -143,7 +143,7 @@ ClientEntitySelector parse() throws CommandSyntaxException {
             if (reader.canRead() && reader.peek() == '@') {
                 parseAtSelector();
             } else {
-                parsePlayerName();
+                parsePlayerNameOrUuid();
             }
 
             if (boxX != null || boxY != null || boxZ != null) {
@@ -166,7 +166,7 @@ ClientEntitySelector parse() throws CommandSyntaxException {
             return new ClientEntitySelector(filter, sorter, limit, senderOnly, originX, originY, originZ);
         }
 
-        void parsePlayerName() throws CommandSyntaxException {
+        void parsePlayerNameOrUuid() throws CommandSyntaxException {
             if (reader.canRead()) {
                 int start = reader.getCursor();
                 suggestor = (builder, playerNameSuggestor) -> {
@@ -179,6 +179,15 @@ void parsePlayerName() throws CommandSyntaxException {
 
             int start = reader.getCursor();
             String playerName = reader.readString();
+            try {
+                UUID uuid = UUID.fromString(playerName);
+                filter = (origin, entity) -> entity.getUuid().equals(uuid);
+                limit = 1;
+                return;
+            } catch (IllegalArgumentException ignore) {
+                // we don't have a uuid, check player names
+            }
+
             if (playerName.isEmpty() || playerName.length() > 16) {
                 reader.setCursor(start);
                 throw EntitySelectorReader.INVALID_ENTITY_EXCEPTION.createWithContext(reader);