From 7e31f4bab28d681dbcf655c479d0f35ee37fb916 Mon Sep 17 00:00:00 2001
From: Esmorall <luis@minemora.net>
Date: Sat, 21 Dec 2019 01:04:05 -0300
Subject: [PATCH] Check if entity is valid before ticking again

---
 .../v1_14_R1/entityTick/EntityTickManager.java                 | 3 +++
 .../v1_15_R1/entityTick/EntityTickManager.java                 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java
index 04874c4..674deb3 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java
@@ -70,6 +70,9 @@ public class EntityTickManager extends BukkitRunnable {
 					if(entity == null) {
 						continue;
 					}
+					if(!entity.valid) {
+						continue;
+					}
 					if(ws.entitiesById.containsValue(entity)) {
 						continue;
 					}
diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java
index c4d4b5f..8437984 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java
@@ -70,6 +70,9 @@ public class EntityTickManager extends BukkitRunnable {
 					if(entity == null) {
 						continue;
 					}
+					if(!entity.valid) {
+						continue;
+					}
 					if(ws.entitiesById.containsValue(entity)) {
 						continue;
 					}