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 67dffaad30d16e4b0c9918d58c710e4ebe9509b7 Mon Sep 17 00:00:00 2001
From 88e8ee2a56a8905befcc383e7dfc05dada4eabbd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -3366,10 +3366,10 @@ index 0357c9da93..98a657cece 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 8c60e565ec..dbdef3ad96 100644
index 9437a06d82..4ecc89ac44 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1301,6 +1301,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1308,6 +1308,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3377,7 +3377,7 @@ index 8c60e565ec..dbdef3ad96 100644
if (this.isPassenger()) {
if (f >= -1.0F && f <= 1.0F) {
this.aZ = f;
@@ -1313,7 +1314,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1320,7 +1321,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.jumping = flag;
this.setSneaking(flag1);
}
@@ -5227,7 +5227,7 @@ index 0c7f094e54..62a0810062 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f97b304ade..d2fac7f296 100644
index fb584091af..62daa6d2a6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -995,6 +995,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -6562,5 +6562,5 @@ index 0967ef424b..7125c0477e 100644
+ "cannot.ride.mob": "You cannot mount that mob"
+}
--
2.24.0
2.26.2