Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
f09fed89 Update upstream B/CB
7c1ef0b7 Add option to ignore the java version check in CB
510dfd60 [CI-SKIP] Update build badge in README to use proper job
This commit is contained in:
William Blake Galbreath
2020-02-08 20:14:57 -06:00
parent cd602cef9a
commit e52e23265f
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0063-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From cbad8f66944097c606fb7e9351e5261a6cb05bbe Mon Sep 17 00:00:00 2001
From 9d111c00f2bbadee62ebce15c894ce547fffe2a8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling
3 files changed, 34 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
index 8e93f1540b..470f92c4fb 100644
index 8e93f1540..470f92c4f 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
@@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2e74e46d5d..b51f7b4537 100644
index d99a2837c..36b4fb28c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 2e74e46d5d..b51f7b4537 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2666,6 +2682,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2667,6 +2683,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -75,7 +75,7 @@ index 2e74e46d5d..b51f7b4537 100644
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 25ca8381b3..306d86d842 100644
index 40b5db9e0..e7805ad1c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -167,6 +167,11 @@ public class PurpurConfig {
@@ -91,5 +91,5 @@ index 25ca8381b3..306d86d842 100644
private static void updatePermissionsOnWorldChange() {
updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange);
--
2.24.0.rc1
2.24.0