Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
68 Zeilen
3.0 KiB
Diff
68 Zeilen
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 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/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
|
|
index c6fd50daa842aae7558ae14196483b544c377c29..19e72da6d9a8bf43d1d25c1be3aa23c75dd6e5d7 100644
|
|
--- a/src/main/java/net/minecraft/server/LoginListener.java
|
|
+++ b/src/main/java/net/minecraft/server/LoginListener.java
|
|
@@ -97,6 +97,12 @@ public class LoginListener implements PacketLoginInListener {
|
|
|
|
}
|
|
|
|
+ // Paper start - Cache authenticator threads
|
|
+ private static final AtomicInteger threadId = new AtomicInteger(0);
|
|
+ private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool(
|
|
+ r -> new Thread(r, "User Authenticator #" + threadId.incrementAndGet())
|
|
+ );
|
|
+ // Paper end
|
|
// Spigot start
|
|
public void initUUID()
|
|
{
|
|
@@ -175,8 +181,8 @@ public class LoginListener implements PacketLoginInListener {
|
|
this.networkManager.sendPacket(new PacketLoginOutEncryptionBegin("", this.server.getKeyPair().getPublic(), this.e));
|
|
} else {
|
|
// Spigot start
|
|
- new Thread("User Authenticator #" + LoginListener.b.incrementAndGet()) {
|
|
-
|
|
+ // Paper start - Cache authenticator threads
|
|
+ authenticatorPool.execute(new Runnable() {
|
|
@Override
|
|
public void run() {
|
|
try {
|
|
@@ -187,7 +193,8 @@ public class LoginListener implements PacketLoginInListener {
|
|
server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + i.getName(), ex);
|
|
}
|
|
}
|
|
- }.start();
|
|
+ });
|
|
+ // Paper end
|
|
// Spigot end
|
|
}
|
|
|
|
@@ -204,7 +211,8 @@ public class LoginListener implements PacketLoginInListener {
|
|
this.loginKey = packetlogininencryptionbegin.a(privatekey);
|
|
this.g = LoginListener.EnumProtocolState.AUTHENTICATING;
|
|
this.networkManager.a(this.loginKey);
|
|
- Thread thread = new Thread("User Authenticator #" + LoginListener.b.incrementAndGet()) {
|
|
+ // Paper start - Cache authenticator threads
|
|
+ authenticatorPool.execute(new Runnable() {
|
|
public void run() {
|
|
GameProfile gameprofile = LoginListener.this.i;
|
|
|
|
@@ -251,10 +259,8 @@ public class LoginListener implements PacketLoginInListener {
|
|
|
|
return LoginListener.this.server.Y() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null;
|
|
}
|
|
- };
|
|
-
|
|
- thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LoginListener.LOGGER));
|
|
- thread.start();
|
|
+ });
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|