From 9bdc7e711d66f2aabac9cde0b3723ef68105df87 Mon Sep 17 00:00:00 2001 From: willies952002 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 79f7a678a7..e2ed2d3c1f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -81,6 +81,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc private final List c = Lists.newArrayList(); private final Set tileEntityListUnload = com.google.common.collect.Sets.newHashSet(); // Paper public final List players = Lists.newArrayList(); + public final Map playersByName = Maps.newHashMap(); // Paper - World EntityHuman Lookup Optimizations public final List k = Lists.newArrayList(); protected final IntHashMap entitiesById = new IntHashMap(); private final long F = 16777215L; @@ -1089,6 +1090,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc EntityHuman entityhuman = (EntityHuman) entity; this.players.add(entityhuman); + this.playersByName.put(entityhuman.getName(), entityhuman); + // Paper end this.everyoneSleeping(); } @@ -1131,6 +1134,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); + this.playersByName.remove(entity.getName()); // Paper - World EntityHuman Lookup Optimizations // Spigot start for ( WorldPersistentData worldData : worldMaps.a.values() ) { @@ -1164,6 +1168,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); + this.playersByName.remove(entity.getName()); // Paper - World EntityHuman Lookup Optimizations this.everyoneSleeping(); } @@ -2705,6 +2710,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @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); @@ -2714,10 +2721,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } 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); @@ -2727,6 +2739,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc } return null; + */ + Entity entity = ((WorldServer)this).entitiesByUUID.get(uuid); + return entity instanceof EntityHuman ? (EntityHuman) entity : null; + // Paper end } public void checkSession() throws ExceptionWorldConflict { -- 2.19.0