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 7da20b7f3bd17fd2432f48cb077c4370bb39492e Mon Sep 17 00:00:00 2001
From 8e1600d2455ebc20f0534f28db43d60b2d8c1538 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -50,10 +50,10 @@ index 27cfc6654e..d62174e9c7 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f0603a575c..534f08815e 100644
index 2a70beedc2..96f98926eb 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1634,8 +1634,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1641,8 +1641,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();
@@ -171,7 +171,7 @@ index 1398c47a2f..0bf1a14b7c 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 96161160bb..762aad378c 100644
index 4ac20e1ecc..57e8c22d05 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -206,7 +206,7 @@ index 96161160bb..762aad378c 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 41179fe312..e82d091746 100644
index 40b522a1bf..57ec42c732 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -409,7 +409,7 @@ public class WorldServer extends World {
@@ -250,10 +250,10 @@ index d6405b2ec5..41dd1b8616 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bd4d5184b6..7bd271d4c2 100644
index 141003ca71..e15c123878 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2078,4 +2078,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2086,4 +2086,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end