66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
From 1e1c86320251ddee4d47d350d6aeafba60214f49 Mon Sep 17 00:00:00 2001
|
|
From: Alfie Cleveland <alfeh@me.com>
|
|
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 dc32dc80d..cf2a39384 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -5,8 +5,10 @@ import com.mojang.authlib.GameProfile;
|
|
import io.netty.buffer.Unpooled;
|
|
import io.netty.util.concurrent.Future;
|
|
import io.netty.util.concurrent.GenericFutureListener;
|
|
+import java.util.ArrayDeque; // Paper
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
+import java.util.Deque; // Paper
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
@@ -44,7 +46,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public final PlayerInteractManager playerInteractManager;
|
|
public double d;
|
|
public double e;
|
|
- public final List<Integer> removeQueue = Lists.newLinkedList();
|
|
+ public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
|
|
private final AdvancementDataPlayer cg;
|
|
private final ServerStatisticManager ch;
|
|
private float ci = Float.MIN_VALUE;
|
|
@@ -351,10 +353,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));
|
|
}
|
|
@@ -1119,7 +1128,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
this.lastHealthSent = -1.0F;
|
|
this.cp = -1;
|
|
// this.cz.a((RecipeBook) entityplayer.cz); // CraftBukkit
|
|
- this.removeQueue.addAll(entityplayer.removeQueue);
|
|
+ // Paper start - Optimize remove queue
|
|
+ //this.removeQueue.addAll(entityplayer.removeQueue);
|
|
+ if (this.removeQueue != entityplayer.removeQueue) {
|
|
+ this.removeQueue.addAll(entityplayer.removeQueue);
|
|
+ }
|
|
this.cy = entityplayer.cy;
|
|
this.cD = entityplayer.cD;
|
|
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
|
|
--
|
|
2.18.0
|
|
|