Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
0f06d380 Restrict vanilla teleport command to within worldborder
24d93aaf Fix Optional null issue - Fixes #3155
eb71c5fa Fix incorect timing of mspt
1ca80434 Optimise entity hard collision checking
b67a4237 Don't run entity collision code if not needed
bd9aa547 Optimise ArraySetSorted#removeIf
78871d07 Make JavaClassLoader thread-safe (Fixes #3137) (#3144)
This commit is contained in:
ChrystiGalbreath
2020-04-16 20:45:31 -05:00
parent ea1b4e3583
commit 6c4aab0053
21 changed files with 270 additions and 306 deletions

View File

@@ -1,4 +1,4 @@
From 078dd0a43d122985c30e849bb195a1d1cf0d1054 Mon Sep 17 00:00:00 2001
From 5b6105785f4193955d46d5a7ccedd757cdb2deb8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 6 Mar 2020 13:37:26 -0600
Subject: [PATCH] Fix the dead lagging the server
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix the dead lagging the server
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6c3d5cdab3..61b931e6bf 100644
index 68a951002..d140ffcf9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1355,7 +1355,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1389,7 +1389,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
this.lastYaw = this.yaw;
this.lastPitch = this.pitch;
@@ -22,7 +22,7 @@ index 6c3d5cdab3..61b931e6bf 100644
public void setPositionRotation(BlockPosition blockposition, float f, float f1) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0405393f32..2769077bb4 100644
index e69b09aa1..19e281bec 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2385,7 +2385,7 @@ public abstract class EntityLiving extends Entity {
@@ -35,5 +35,5 @@ index 0405393f32..2769077bb4 100644
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
--
2.24.0
2.25.0.windows.1