Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
aa8a835912 aa8a835912
7d48a46bc2 7d48a46bc2
6852c657cd 6852c657cd
This commit is contained in:
BillyGalbreath
2021-12-29 18:08:41 -06:00
parent 2dbdcf680d
commit 288d42c358
8 changed files with 17 additions and 17 deletions

View File

@@ -5,7 +5,7 @@ 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 072a34d8f8a075f22c14634acd0dd50ec57b773c..c2e849f37c03839631f621065bf52b4c649e06c5 100644
index 5ad5b6c90aedf6f0c7387055fa07ff46548ac32e..e50198e2bdf773dbb6297b31bac23d8c66431840 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index 072a34d8f8a075f22c14634acd0dd50ec57b773c..c2e849f37c03839631f621065bf52b4c
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
@@ -3117,6 +3133,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3120,6 +3136,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {