mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
637a5bcfec
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 04405534 SPIGOT-5034: FoodLevelChangeEvent add getItem method 8154c64c SPIGOT-4984: EnchantmentOffer.getCost() documentation is misleading CraftBukkit Changes:f2757f95SPIGOT-5071: Player loot tables not triggeredf4242226Optimize getEntitiesByClasses slightlye81013d7SPIGOT-5072: Process phantom, cat and patrol spawning in CustomChunkGenerator30a63379SPIGOT-5010: World#getEntitiesByClass/es also return entities in border chunks.43431ba6SPIGOT-5034: FoodLevelChangeEvent add getItem method
71 lines
3.3 KiB
Diff
71 lines
3.3 KiB
Diff
From 612c295c15b346d0b04a58b456f10b21a19353f6 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 0e0faef89e..8254b8d68d 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.mojang.authlib.GameProfile;
|
|
import com.mojang.datafixers.util.Either;
|
|
import io.netty.util.concurrent.Future;
|
|
+import java.util.ArrayDeque; // Paper
|
|
import java.util.Collection;
|
|
+import java.util.Deque; // Paper
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.OptionalInt;
|
|
@@ -41,7 +43,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public PlayerConnection playerConnection;
|
|
public final MinecraftServer server;
|
|
public final PlayerInteractManager playerInteractManager;
|
|
- public final List<Integer> removeQueue = Lists.newLinkedList();
|
|
+ public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
|
|
private final AdvancementDataPlayer advancementDataPlayer;
|
|
private final ServerStatisticManager serverStatisticManager;
|
|
private float lastHealthScored = Float.MIN_VALUE;
|
|
@@ -365,13 +367,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<Integer> iterator = this.removeQueue.iterator();
|
|
+ //Iterator<Integer> iterator = this.removeQueue.iterator(); // Paper
|
|
int j = 0;
|
|
|
|
- while (iterator.hasNext() && j < i) {
|
|
+ // Paper start
|
|
+ /* while (iterator.hasNext() && j < i) {
|
|
aint[j++] = (Integer) iterator.next();
|
|
iterator.remove();
|
|
+ } */
|
|
+
|
|
+ Integer integer;
|
|
+ while (j < i && (integer = this.removeQueue.poll()) != null) {
|
|
+ aint[j++] = integer.intValue();
|
|
}
|
|
+ // Paper end
|
|
|
|
this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
|
|
}
|
|
@@ -1321,7 +1330,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
this.lastHealthSent = -1.0F;
|
|
this.lastFoodSent = -1;
|
|
// this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit
|
|
- 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.
|
|
+ //this.removeQueue.addAll(entityplayer.removeQueue);
|
|
+ if (this.removeQueue != entityplayer.removeQueue) {
|
|
+ this.removeQueue.addAll(entityplayer.removeQueue);
|
|
+ }
|
|
+ // Paper end
|
|
this.cp = entityplayer.cp;
|
|
this.cu = entityplayer.cu;
|
|
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
|
|
--
|
|
2.22.0
|
|
|