Paper/Spigot-Server-Patches/0147-Optimise-removeQueue.patch

73 lines
3.2 KiB
Diff
Raw Normal View History

From 223a15ae2ff86485b0fbe27045dce04f08176b14 Mon Sep 17 00:00:00 2001
2016-11-27 12:35:42 +08:00
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 c33c6f480c..891b804a6e 100644
2016-11-27 12:35:42 +08:00
--- 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;
2016-11-27 12:35:42 +08:00
import io.netty.buffer.Unpooled;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
2016-11-27 12:35:42 +08:00
+import java.util.ArrayDeque; // Paper
2017-05-15 02:05:01 +08:00
import java.util.ArrayList;
2016-11-27 12:35:42 +08:00
import java.util.Collection;
+import java.util.Deque; // Paper
import java.util.Iterator;
import java.util.List;
import java.util.Random;
@@ -43,7 +45,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2016-11-27 12:35:42 +08:00
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 cf;
private final ServerStatisticManager cg;
private float ch = Float.MIN_VALUE;
@@ -352,13 +354,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
while (!this.removeQueue.isEmpty()) {
int i = Math.min(this.removeQueue.size(), Integer.MAX_VALUE);
int[] aint = new int[i];
- Iterator iterator = this.removeQueue.iterator();
+ //Iterator iterator = this.removeQueue.iterator(); // Paper
2016-11-27 12:35:42 +08:00
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));
}
@@ -1138,7 +1147,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2016-11-27 12:35:42 +08:00
this.lastHealthSent = -1.0F;
this.co = -1;
// this.cy.a((RecipeBook) entityplayer.cy); // CraftBukkit
2017-05-15 02:05:01 +08:00
- this.removeQueue.addAll(entityplayer.removeQueue);
+ // Paper start - Optimize remove queue - vanilla copies player objects, but CB doesn't. This method currently only
+ // Applies to the same player, so we need to not duplicate our removal queue. The rest of this method does "resetting"
+ // type logic so it does need to be called, maybe? This is silly.
2017-05-21 12:41:39 +08:00
+ //this.removeQueue.addAll(entityplayer.removeQueue);
2017-05-15 02:05:01 +08:00
+ if (this.removeQueue != entityplayer.removeQueue) {
+ this.removeQueue.addAll(entityplayer.removeQueue);
2016-11-27 12:35:42 +08:00
+ }
+ // Paper end
this.cx = entityplayer.cx;
this.cC = entityplayer.cC;
2017-05-15 02:05:01 +08:00
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
2016-11-27 12:35:42 +08:00
--
2.19.1
2016-11-27 12:35:42 +08:00