Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@eff22eb Ensure players are removed from pendingLogin

Pufferfish Changes:
pufferfish-gg/Pufferfish@31d0ff3 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@4882a95 Fix PAPI edge-case
pufferfish-gg/Pufferfish@254c002 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@4b26a0b Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2c1e02e Updated Upstream (Paper)
pufferfish-gg/Pufferfish@3888607 Update DAB entities
This commit is contained in:
BillyGalbreath
2022-08-29 12:33:47 -05:00
parent 7005356a4d
commit ef2160f5bf
34 changed files with 255 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0022-Alternative-Keepalive-Handling.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Alternative Keepalive Handling
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9873e559675203df5fc0b44c820fdd2671b17c23..accc5e15eef680c82bab4fdcf759d7b17e57dd67 100644
index 8d13fad0bd574cf9cd01d7aa5754023aecf46104..2e03ec98f16295c8adec397dfaf0fb2a101ecc88 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -261,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -260,6 +260,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private long keepAliveTime = Util.getMillis();
private boolean keepAlivePending;
private long keepAliveChallenge;
@@ -16,7 +16,7 @@ index 9873e559675203df5fc0b44c820fdd2671b17c23..accc5e15eef680c82bab4fdcf759d7b1
// CraftBukkit start - multithreaded fields
private final AtomicInteger chatSpamTickCount = new AtomicInteger();
private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
@@ -427,6 +428,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -421,6 +422,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
long currentTime = Util.getMillis();
long elapsedTime = currentTime - this.keepAliveTime;
@@ -38,7 +38,7 @@ index 9873e559675203df5fc0b44c820fdd2671b17c23..accc5e15eef680c82bab4fdcf759d7b1
if (this.keepAlivePending) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -3638,6 +3654,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3632,6 +3648,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {