core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimise removeQueue

This commit is contained in:
Alfie Cleveland 2016-11-26 22:35:42 -06:00 committed by Zach Brown
parent ed90e5b3a6
commit a0fce85086
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Spigot-Server-Patches/0182-Optimise-removeQueue.patch Normal file
View File

@ -0,0 +1,65 @@
From d9d4f87eda37e0cf3a41775af63db778ed14d1e5 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 ec06d8e..29e9786 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;
@@ -34,7 +36,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 ServerStatisticManager bU;
private float bV = Float.MIN_VALUE;
private int bW = Integer.MIN_VALUE;
@@ -229,10 +231,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));
}
@@ -969,7 +978,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.10.2