Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
64666dc8 Improve Chunk Priority, Frustum Priority and Load Speed Algorithms
146b9908 Improve ChunkMapDistance.b crash fix to clean up properly
2c4499b7 Show Plugins Event Listeners under Combined Total in Timings
c5c909c9 Improve Plugin Ticket Management
b20529f3 Update to HTTPS in README (#3460)
de6dfedf Make Anti-Xray multithreaded (#3520)
531c4b3f Add PluginTickets to API Chunk Methods
b2d81e21 Improve Chunk Prioritization and Internal Scheduler
24a2e804 Improve Login to use Urgent priority - improves login chunk load times
This commit is contained in:
William Blake Galbreath
2020-06-10 00:29:38 -05:00
parent 2fbbafa299
commit bbcde382a2
15 changed files with 73 additions and 73 deletions

View File

@@ -1,4 +1,4 @@
From 0f59e2f777292ba288e3488eae06324d7e5159c7 Mon Sep 17 00:00:00 2001
From 289e82a07dfc2238298bbc0d81819d1f57b55628 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
@@ -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 762aad378c..0cd012dfc3 100644
index 57e8c22d05..80a75912fb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 762aad378c..0cd012dfc3 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
@@ -2659,6 +2675,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2660,6 +2676,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -90,5 +90,5 @@ index 72ad9dce7d..ed2a312773 100644
private static void dontSendUselessEntityPackets() {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
--
2.24.0
2.26.2