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 b3b4d02dc668165685959f67e420b92033d8b438 Mon Sep 17 00:00:00 2001
From 04e2a3750f02b48b1370cf8fcf25a2da357f8aa4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:16 -0600
Subject: [PATCH] Add moon phase API
@@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d3c5b7d190..66f3e9393e 100644
index f4a1be34f0..1913b31bc1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2462,6 +2462,14 @@ public class CraftWorld implements World {
@@ -2477,6 +2477,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}
@@ -27,5 +27,5 @@ index d3c5b7d190..66f3e9393e 100644
@Override
public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
--
2.24.0
2.26.2