papermc/Spigot-Server-Patches/0171-Optimise-removeQueue.patch

66 lines
2.7 KiB
Diff
Raw Normal View History

2017-05-28 04:25:17 +00:00
From ead97748d3e8508b9d6f43872697804248e10878 Mon Sep 17 00:00:00 2001
2016-11-27 04:35:42 +00: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
2017-05-28 04:25:17 +00:00
index 04c36d36e..2ee3fb782 100644
2016-11-27 04:35:42 +00:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
2017-05-14 18:05:01 +00:00
@@ -3,8 +3,10 @@ package net.minecraft.server;
import com.google.common.collect.Lists;
2016-11-27 04:35:42 +00:00
import com.mojang.authlib.GameProfile;
import io.netty.buffer.Unpooled;
+import java.util.ArrayDeque; // Paper
2017-05-14 18:05:01 +00:00
import java.util.ArrayList;
2016-11-27 04:35:42 +00:00
import java.util.Collection;
+import java.util.Deque; // Paper
import java.util.Iterator;
import java.util.List;
2017-05-14 18:05:01 +00:00
import javax.annotation.Nonnull;
2017-05-28 04:25:17 +00:00
@@ -39,7 +41,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2016-11-27 04:35:42 +00: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
2017-05-21 04:41:39 +00:00
private final AdvancementDataPlayer bY;
private final ServerStatisticManager bZ;
private float ca = Float.MIN_VALUE;
2017-05-28 04:25:17 +00:00
@@ -287,10 +289,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2016-11-27 04:35:42 +00:00
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));
}
2017-05-28 04:25:17 +00:00
@@ -1098,7 +1107,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2016-11-27 04:35:42 +00:00
this.lastHealthSent = -1.0F;
2017-05-21 04:41:39 +00:00
this.ch = -1;
// this.cr.a((RecipeBook) entityplayer.cr); // CraftBukkit
2017-05-14 18:05:01 +00:00
- this.removeQueue.addAll(entityplayer.removeQueue);
2017-05-21 04:41:39 +00:00
+ // Paper start - Optimize remove queue
+ //this.removeQueue.addAll(entityplayer.removeQueue);
2017-05-14 18:05:01 +00:00
+ if (this.removeQueue != entityplayer.removeQueue) {
+ this.removeQueue.addAll(entityplayer.removeQueue);
2016-11-27 04:35:42 +00:00
+ }
2017-05-21 04:41:39 +00:00
this.cq = entityplayer.cq;
this.cv = entityplayer.cv;
2017-05-14 18:05:01 +00:00
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
2016-11-27 04:35:42 +00:00
--
2017-05-21 04:41:39 +00:00
2.13.0.windows.1
2016-11-27 04:35:42 +00:00