Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c793bd9 Allow LEFT_CLICK_AIR in 3.0->4.5 range of entity (#9211)
PaperMC/Paper@40adc23 [ci skip] Fix incorrect javadoc in JarLibrary (#9513)
PaperMC/Paper@c016e03 Fix unbreakable flint and steel consumed when igniting creepers (#9509)
This commit is contained in:
granny
2023-07-20 00:01:51 -07:00
parent 96ebdc8461
commit 8fec60c7bc
7 changed files with 18 additions and 18 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 bad43ba1a75015a06bd39ce654b82f8d10b9c326..eb57d8773dc352d13165dd2fd35d6d644f801c54 100644
index d91fd3fa0f08dc43641ad628f26be123548ddf4e..bcce3550b8bde5eb9b187e99349044e7a9538e5a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -263,6 +263,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -38,7 +38,7 @@ index bad43ba1a75015a06bd39ce654b82f8d10b9c326..eb57d8773dc352d13165dd2fd35d6d64
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
@@ -3493,6 +3509,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3500,6 +3516,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {