From 8f265f4e526c1b74d5171ff53cd5673fe6b10c7a Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Sat, 8 Jan 2022 23:11:10 +0100
Subject: [PATCH] Improve performance of `player()` related methods (#1240)

---
 src/main/java/carpet/script/api/Entities.java | 76 ++++++++-----------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/src/main/java/carpet/script/api/Entities.java b/src/main/java/carpet/script/api/Entities.java
index 8f4de7c8..4ad079ac 100644
--- a/src/main/java/carpet/script/api/Entities.java
+++ b/src/main/java/carpet/script/api/Entities.java
@@ -3,6 +3,7 @@ package carpet.script.api;
 import carpet.script.CarpetContext;
 import carpet.script.CarpetEventServer;
 import carpet.script.CarpetScriptHost;
+import carpet.script.Context;
 import carpet.script.Expression;
 import carpet.script.argument.FunctionArgument;
 import carpet.script.argument.Vector3Argument;
@@ -36,9 +37,20 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class Entities {
+    private static ListValue getPlayersFromWorldMatching(Context c, Predicate<ServerPlayerEntity> condition) {
+        List<Value> ret = new ArrayList<>();
+        for (ServerPlayerEntity player: ((CarpetContext) c).s.getWorld().getPlayers()) {
+            if (condition.test(player)) {
+                ret.add(new EntityValue(player));
+            }
+        }
+        return ListValue.wrap(ret);
+    }
+
     public static void apply(Expression expression)
     {
         expression.addContextFunction("player", -1, (c, t, lv) ->
@@ -58,50 +70,26 @@ public class Entities {
                 return EntityValue.of(closestPlayer);
             }
             String playerName = lv.get(0).getString();
-            Value retval = Value.NULL;
-            if ("all".equalsIgnoreCase(playerName))
-            {
-                retval = ListValue.wrap(
-                        ((CarpetContext)c).s.getServer().getPlayerManager().getPlayerList().
-                                stream().map(EntityValue::new).collect(Collectors.toList()));
-            }
-            else if ("*".equalsIgnoreCase(playerName))
-            {
-                retval = ListValue.wrap(
-                        ((CarpetContext)c).s.getWorld().getPlayers().
-                                stream().map(EntityValue::new).collect(Collectors.toList()));
-            }
-            else if ("survival".equalsIgnoreCase(playerName))
-            {
-                retval =  ListValue.wrap(
-                        ((CarpetContext)c).s.getWorld().getPlayers((p) -> p.interactionManager.isSurvivalLike()).
-                                stream().map(EntityValue::new).collect(Collectors.toList()));
-            }
-            else if ("creative".equalsIgnoreCase(playerName))
-            {
-                retval = ListValue.wrap(
-                        ((CarpetContext)c).s.getWorld().getPlayers(PlayerEntity::isCreative).
-                                stream().map(EntityValue::new).collect(Collectors.toList()));
-            }
-            else if ("spectating".equalsIgnoreCase(playerName))
-            {
-                retval = ListValue.wrap(
-                        ((CarpetContext)c).s.getWorld().getPlayers(PlayerEntity::isSpectator).
-                                stream().map(EntityValue::new).collect(Collectors.toList()));
-            }
-            else if ("!spectating".equalsIgnoreCase(playerName))
-            {
-                retval = ListValue.wrap(
-                        ((CarpetContext)c).s.getWorld().getPlayers((p) -> !p.isSpectator()).
-                                stream().map(EntityValue::new).collect(Collectors.toList()));
-            }
-            else
-            {
-                ServerPlayerEntity player = ((CarpetContext) c).s.getServer().getPlayerManager().getPlayer(playerName);
-                if (player != null)
-                    retval = new EntityValue(player);
-            }
-            return retval;
+            return switch (playerName) {
+                case "all" -> {
+                    List<Value> ret = new ArrayList<>();
+                    for (ServerPlayerEntity player: ((CarpetContext)c).s.getServer().getPlayerManager().getPlayerList())
+                        ret.add(new EntityValue(player));
+                    yield ListValue.wrap(ret);
+                }
+                case "*" -> getPlayersFromWorldMatching(c, p -> true);
+                case "survival" -> getPlayersFromWorldMatching(c, p -> p.interactionManager.isSurvivalLike());
+                case "creative" -> getPlayersFromWorldMatching(c, PlayerEntity::isCreative);
+                case "spectating" -> getPlayersFromWorldMatching(c, PlayerEntity::isSpectator);
+                case "!spectating" -> getPlayersFromWorldMatching(c, p -> !p.isSpectator());
+                default -> {
+                    ServerPlayerEntity player = ((CarpetContext) c).s.getServer().getPlayerManager().getPlayer(playerName);
+                    if (player != null) {
+                        yield new EntityValue(player);
+                    }
+                    yield Value.NULL;
+                }
+            };
         });
 
         expression.addContextFunction("spawn", -1, (c, t, lv) ->