e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
72 Zeilen
3.3 KiB
Diff
72 Zeilen
3.3 KiB
Diff
From b704867d1819955074cbb3ccc90c76c0d276f426 Mon Sep 17 00:00:00 2001
|
|
From: vemacs <d@nkmem.es>
|
|
Date: Wed, 23 Nov 2016 08:31:45 -0500
|
|
Subject: [PATCH] Cache user authenticator threads
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index a5701623bf..d3bdec7995 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;
|
|
@@ -371,13 +373,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));
|
|
}
|
|
@@ -1332,7 +1341,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.cm = entityplayer.cm;
|
|
this.cr = entityplayer.cr;
|
|
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
|
|
--
|
|
2.25.1
|
|
|