From b3a51f2ce44e39c2fb185c5eb0020b9a767f5a79 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 3486451b3..26ecf2c70 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -122,10 +122,10 @@ public abstract class Entity implements ICommandListener { private static final DataWatcherObject aC = DataWatcher.a(Entity.class, DataWatcherRegistry.h); private static final DataWatcherObject aD = DataWatcher.a(Entity.class, DataWatcherRegistry.h); private static final DataWatcherObject aE = DataWatcher.a(Entity.class, DataWatcherRegistry.h); - public boolean aa; - public int ab; - public int ac; - public int ad; + public boolean aa; public boolean isAddedToChunk() { return aa; } // Paper - OBFHELPER + public int ab; public int getChunkX() { return ab; } // Paper - OBFHELPER + public int ac; public int getChunkY() { return ac; } // Paper - OBFHELPER + public int ad; public int getChunkZ() { return ad; } // Paper - OBFHELPER public boolean ah; public boolean impulse; public int portalCooldown; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index df8b330a5..1bb2a1a56 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.generator.ChunkGenerator; // CraftBukkit end +// Paper start +import java.util.Set; +import com.google.common.collect.Sets; +// Paper end + public abstract class World implements IBlockAccess { private int a = 63; @@ -61,11 +66,11 @@ public abstract class World implements IBlockAccess { } }; // Spigot end - protected final List f = Lists.newArrayList(); + protected final Set f = Sets.newHashSet(); // Paper public final List tileEntityList = Lists.newArrayList(); public final List tileEntityListTick = Lists.newArrayList(); private final List b = Lists.newArrayList(); - private final List tileEntityListUnload = Lists.newArrayList(); + private final Set tileEntityListUnload = Sets.newHashSet(); // Paper public final List players = Lists.newArrayList(); public final List j = Lists.newArrayList(); protected final IntHashMap entitiesById = new IntHashMap(); @@ -1399,20 +1404,20 @@ public abstract class World implements IBlockAccess { this.entityList.removeAll(this.f); int j; + // Paper start - Set based removal lists + for (Entity e : this.f) { + j = e.getChunkZ(); + int k = e.getChunkX(); - for (i = 0; i < this.f.size(); ++i) { - entity = (Entity) this.f.get(i); - int k = entity.ab; - - j = entity.ad; - if (entity.aa && this.isChunkLoaded(k, j, true)) { - this.getChunkAt(k, j).b(entity); + if (e.isAddedToChunk() && this.isChunkLoaded(k, j, true)) { + this.getChunkAt(k, j).b(e); } } - for (i = 0; i < this.f.size(); ++i) { - this.c((Entity) this.f.get(i)); + for (Entity e : this.f) { + this.c(e); } + // Paper end this.f.clear(); this.l(); -- 2.13.3.windows.1