Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a219c497bd Dont register multiple ASK_SERVER suggestions under one parent node (#7188)
329912b816 Expose isFuel and canSmelt methods to FurnaceInventory (#7181)
7b833ca18f Fix bees aging inside hives (#6466)
a99a33cdd9 Bucketable API (#7204)
721f14842f [ci skip] Change test logging settings to log by default (#7203)
2d458ee14f Check player world in endPortalSoundRadius (#6226)
686bbd33d4 Fix EntityLoadCrossbowEvent Sync Issue (#5739)
64f9225c94 Fix riding distance statistics (#7021/SPIGOT-6475) (#7033)
This commit is contained in:
BillyGalbreath
2021-12-31 05:35:42 -06:00
parent 3607ed47ad
commit ce115a0bfc
18 changed files with 35 additions and 290 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 5ad5b6c90aedf6f0c7387055fa07ff46548ac32e..e50198e2bdf773dbb6297b31bac23d8c66431840 100644
index 9a2920d61111fd9ff99424ea356a6b64b47eead5..96f2beae139609535a4ff79809ece95d99d0f01a 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 5ad5b6c90aedf6f0c7387055fa07ff46548ac32e..e50198e2bdf773dbb6297b31bac23d8c
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
@@ -3120,6 +3136,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3133,6 +3149,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {