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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@1c779c2 Update to 1.18.1 (#7076)
PaperMC/Paper@901fd94 [ci skip] Update README
This commit is contained in:
Encode42
2021-12-10 16:04:19 -05:00
parent 26e5f080f2
commit 1fd37bdec4
26 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0021-Alternative-Keepalive-Handling.patch
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 41690c6cd2cb787b3c075dcfd9400e711ce8e561..e2975169d6987c3434064c12c62fa70e432a5e91 100644
index 072a34d8f8a075f22c14634acd0dd50ec57b773c..c2e849f37c03839631f621065bf52b4c649e06c5 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
@@ -16,7 +16,7 @@ index 41690c6cd2cb787b3c075dcfd9400e711ce8e561..e2975169d6987c3434064c12c62fa70e
// 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
@@ -371,6 +372,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -372,6 +373,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
long currentTime = Util.getMillis();
long elapsedTime = currentTime - this.keepAliveTime;
@@ -38,7 +38,7 @@ index 41690c6cd2cb787b3c075dcfd9400e711ce8e561..e2975169d6987c3434064c12c62fa70e
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
@@ -3116,6 +3132,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3117,6 +3133,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {