From df2fd9ca4186acf80f5f3516d1d6473d29f4c2b2 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 32bce920b..56ce2554d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.mojang.authlib.GameProfile; import io.netty.buffer.Unpooled; +import java.util.ArrayDeque; // Paper import java.util.Collection; +import java.util.Deque; // Paper import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -38,7 +40,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public final PlayerInteractManager playerInteractManager; public double d; public double e; - public final List removeQueue = Lists.newLinkedList(); + public final Deque removeQueue = new ArrayDeque<>(); // Paper private final ServerStatisticManager bU; private float bV = Float.MIN_VALUE; private int bW = Integer.MIN_VALUE; @@ -250,10 +252,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { Iterator iterator = this.removeQueue.iterator(); int j = 0; - while (iterator.hasNext() && j < i) { + // Paper start + /* while (iterator.hasNext() && j < i) { aint[j++] = ((Integer) iterator.next()).intValue(); iterator.remove(); + } */ + + Integer integer; + while (j < i && (integer = this.removeQueue.poll()) != null) { + aint[j++] = integer.intValue(); } + // Paper end this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } @@ -994,7 +1003,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastSentExp = -1; this.lastHealthSent = -1.0F; this.cc = -1; - this.removeQueue.addAll(((EntityPlayer) entityhuman).removeQueue); + // this.removeQueue.addAll(((EntityPlayer) entityhuman).removeQueue); // Paper + // Paper start + if (this.removeQueue != ((EntityPlayer) entityhuman).removeQueue) { + this.removeQueue.addAll(((EntityPlayer) entityhuman).removeQueue); + } + // Paper end } protected void a(MobEffect mobeffect) { -- 2.12.2