Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)
This commit is contained in:
BillyGalbreath
2022-07-22 16:44:39 -05:00
parent 028780d4e1
commit 9a15789561
27 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0023-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 474944b20fb81e9e4ed42ec2895673c98bc36420..e2f57af54380c7afa5c6ac00c8aba74e838465c4 100644
index b51608b2eaaaa4bf4b89fbd379aa649c3a219c38..da310a616bf5edd2dd9a0b4cbadd5ffec0f22315 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -245,6 +245,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index 474944b20fb81e9e4ed42ec2895673c98bc36420..e2f57af54380c7afa5c6ac00c8aba74e
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
@@ -3360,6 +3376,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3366,6 +3382,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -56,7 +56,7 @@ index 474944b20fb81e9e4ed42ec2895673c98bc36420..e2f57af54380c7afa5c6ac00c8aba74e
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
int i = (int) (Util.getMillis() - this.keepAliveTime);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3b417ecebe7bb621aee76d5155d97695c826f4a6..8124b27f043beb763d70881593a883e06ea59f6e 100644
index c8e4ab0302c2cc4bac858169d68adc48c2047026..20b86de8b204df1636b76073c434f5e436f77379 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -191,6 +191,11 @@ public class PurpurConfig {