Paper/Spigot-Server-Patches/0325-World-EntityHuman-Lookup-Optimizations.patch

From a297d6fe589e774f7342aab72841f8cd259ac4a7 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 30 Jul 2018 02:42:49 -0400
Subject: [PATCH] World EntityHuman Lookup Optimizations


diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e9da359e93..a370934684 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -79,6 +79,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
     private final List<TileEntity> c = Lists.newArrayList();
     private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
     public final List<EntityHuman> players = Lists.newArrayList();
+    public final Map<String, EntityHuman> playersByName = Maps.newHashMap(); // Paper - World EntityHuman Lookup Optimizations
     public final List<Entity> k = Lists.newArrayList();
     protected final IntHashMap<Entity> entitiesById = new IntHashMap();
     private final long G = 16777215L;
@@ -1062,6 +1063,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
                 EntityHuman entityhuman = (EntityHuman) entity;
 
                 this.players.add(entityhuman);
+                this.playersByName.put(entityhuman.getName(), entityhuman);
+                // Paper end
                 this.everyoneSleeping();
             }
 
@@ -1104,6 +1107,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
         entity.die();
         if (entity instanceof EntityHuman) {
             this.players.remove(entity);
+            this.playersByName.remove(entity.getName()); // Paper - World EntityHuman Lookup Optimizations
             // Spigot start
             for ( Object o : worldMaps.d )
             {
@@ -1134,6 +1138,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
         entity.die();
         if (entity instanceof EntityHuman) {
             this.players.remove(entity);
+            this.playersByName.remove(entity.getName()); // Paper - World EntityHuman Lookup Optimizations
             this.everyoneSleeping();
         }
 
@@ -2662,6 +2667,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
 
     @Nullable
     public EntityHuman a(String s) {
+        // Paper start - World EntityHuman Lookup Optimizations
+        /*
         for (int i = 0; i < this.players.size(); ++i) {
             EntityHuman entityhuman = (EntityHuman) this.players.get(i);
 
@@ -2671,10 +2678,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
         }
 
         return null;
+        */
+        return this.playersByName.get(s);
+        // Paper end
     }
 
     @Nullable
     public EntityHuman b(UUID uuid) {
+        // Paper start - World EntityHuman Lookup Optimizations
+        /*
         for (int i = 0; i < this.players.size(); ++i) {
             EntityHuman entityhuman = (EntityHuman) this.players.get(i);
 
@@ -2684,6 +2696,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
         }
 
         return null;
+        */
+        Entity entity = ((WorldServer)this).entitiesByUUID.get(uuid);
+        return entity instanceof EntityHuman ? (EntityHuman) entity : null;
+        // Paper end
     }
 
     public void checkSession() throws ExceptionWorldConflict {
-- 
2.18.0