From aaab88b497998ece65dd4a997f2d2ca778b7450d Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Fri, 22 Mar 2019 04:41:54 +0800
Subject: [PATCH] Ensures do not tick dead entity

---
 src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java | 1 +
 src/main/java/net/minecraft/server/World.java                | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java b/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java
index 1209733a4..e28bbabef 100644
--- a/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java
+++ b/src/main/java/io/akarin/server/core/AkarinAsyncExecutor.java
@@ -1,5 +1,6 @@
 package io.akarin.server.core;
 
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0b0d3aac8..04dda470f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1261,8 +1261,10 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
             // CraftBukkit end
 
             try {
+                if (!entity.dead) { // Akarin start - do not tick dead entity
                 ++entity.ticksLived;
                 entity.tick();
+                } // Akarin end
             } catch (Throwable throwable) {
                 CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
                 CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");