mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 1dc7c308 Optimize Collision Chunk lookup and avoid loading far chunks d5c6dbee Prevent Double PlayerChunkMap adds crashing server a2a9ffe3 Fix issues with Activation Range causing large chunk lookups. 017297cd Improve entity.getCurrentChunk() and use it for entity.isChunkLoaded() 52cf8906 Remove some old removed 1.14 patches that are never going to be needed (fixed/already applied)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From eb48b2cb416c8d84156a17ac3851fc09273d42d4 Mon Sep 17 00:00:00 2001
|
||||
From 84d33f1f61132168a340d0b49f1ef47c7b5e3378 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 f5209ec92..ff0fd8c62 100644
|
||||
index 75db09c34e..4183636ff9 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1348,7 +1348,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -1354,7 +1354,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 f5209ec92..ff0fd8c62 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 b4d1ab191..f3aef6d13 100644
|
||||
index 0405393f32..2769077bb4 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 {
|
||||
}
|
||||
}
|
||||
|
||||
- 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
|
||||
- this.movementTick();
|
||||
+ if (!dead) this.movementTick(); // Purpur
|
||||
double d0 = this.locX() - this.lastX;
|
||||
double d1 = this.locZ() - this.lastZ;
|
||||
float f = (float) (d0 * d0 + d1 * d1);
|
||||
|
||||
Reference in New Issue
Block a user