From 3f37b537b6ace1787ab54b877d7aa06f034de73d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 6 Mar 2020 13:53:16 -0600
Subject: [PATCH] Lets stop more dead stuff

---
 ...nt-do-movementTick-for-dead-entities.patch | 25 ------------
 patches/server/0107-The-dead-dont-move.patch  | 39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 25 deletions(-)
 delete mode 100644 patches/server/0107-Dont-do-movementTick-for-dead-entities.patch
 create mode 100644 patches/server/0107-The-dead-dont-move.patch

diff --git a/patches/server/0107-Dont-do-movementTick-for-dead-entities.patch b/patches/server/0107-Dont-do-movementTick-for-dead-entities.patch
deleted file mode 100644
index 87f2402bf..000000000
--- a/patches/server/0107-Dont-do-movementTick-for-dead-entities.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 78c99e1e4bf9399adfb6b02351da9054f4d36a79 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] Dont do movementTick for dead entities
-
----
- src/main/java/net/minecraft/server/EntityLiving.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e3dc406da..dc6efdb8d 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 (isAlive()) this.movementTick(); // Purpur
-         double d0 = this.locX() - this.lastX;
-         double d1 = this.locZ() - this.lastZ;
-         float f = (float) (d0 * d0 + d1 * d1);
--- 
-2.24.0
-
diff --git a/patches/server/0107-The-dead-dont-move.patch b/patches/server/0107-The-dead-dont-move.patch
new file mode 100644
index 000000000..ac49c3d37
--- /dev/null
+++ b/patches/server/0107-The-dead-dont-move.patch
@@ -0,0 +1,39 @@
+From d8aa4d7aa73dd3d8f6dd48fe9cb2309d6f1bfc74 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] The dead dont move...
+
+---
+ src/main/java/net/minecraft/server/Entity.java       | 2 +-
+ src/main/java/net/minecraft/server/EntityLiving.java | 2 +-
+ 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 697c1d562..4c68e0f77 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -1343,7 +1343,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;
+-        world.getChunkAt((int) Math.floor(this.locX) >> 4, (int) Math.floor(this.locZ) >> 4); // CraftBukkit
++        if (isAlive()) world.getChunkAt((int) Math.floor(this.locX) >> 4, (int) Math.floor(this.locZ) >> 4); // CraftBukkit // Purpur
+     }
+ 
+     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 e3dc406da..dc6efdb8d 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 (isAlive()) this.movementTick(); // Purpur
+         double d0 = this.locX() - this.lastX;
+         double d1 = this.locZ() - this.lastZ;
+         float f = (float) (d0 * d0 + d1 * d1);
+-- 
+2.24.0
+