Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
de5b093c Handle chunk unloading during block tick
be7b4063 performance: Improve Activation Range entity iteration
bacbd880 performance: Many Entity Activation Range Improvements
269394fe Update hidden-configs
This commit is contained in:
William Blake Galbreath
2020-03-30 19:31:24 -05:00
parent 93bb79d462
commit 27fb33e6dc
14 changed files with 179 additions and 186 deletions

View File

@@ -1,4 +1,4 @@
From 5e2fd5f6fa0e2b735e60d5f36175ac371e7e68d5 Mon Sep 17 00:00:00 2001
From f8dadd1fd11472e6be5ed6d5f6dc1115a7adafd7 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 f9c0af5319..2b4504c9ba 100644
index 0d47ca549..a26865601 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1346,7 +1346,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1347,7 +1347,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,15 +22,15 @@ index f9c0af5319..2b4504c9ba 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 b4d1ab191..f3aef6d13 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 {
}
}
- this.movementTick();
+ if (!dead) this.movementTick(); // Purpur
- if (!this.isTemporarilyActive) this.movementTick(); // Paper - don't move if only temporarily active
+ if (!dead && !this.isTemporarilyActive) this.movementTick(); // Paper - don't move if only temporarily active // Purpur
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);