Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@60b7d5e Add unsupported field to disable username validation (#7350)
PaperMC/Paper@17e1f65 Fix Lure infinite loop (#6850)
PaperMC/Paper@048e030 Change default for hoppers ignoring occluded blocks (#7342)
PaperMC/Paper@919e594 Push illegal char kick to main thread (#7363)
PaperMC/Paper@f1db23e [ci skip] Fix incorrect javadoc for Mob pathfinding API (#6842)
This commit is contained in:
BillyGalbreath
2022-01-18 06:24:31 -06:00
parent b3042f20eb
commit 406410e1d4
7 changed files with 14 additions and 14 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 5e2769dac191d725a1e38e61a871baa644d29b44..a1079a9f524e9efcc0b29b1c1b5f4e5aefa9ec85 100644
index 948b65411e1a0f25887ebb7ba58c2bd597f0a28f..08d06ffe52ad77a86e5f1966d508566815d18768 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index 5e2769dac191d725a1e38e61a871baa644d29b44..a1079a9f524e9efcc0b29b1c1b5f4e5a
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
@@ -3135,6 +3151,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3137,6 +3153,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {