From 827bea0c576a0ca046d65bc30d2dedac43b8565c Mon Sep 17 00:00:00 2001
From: Esmorall <luis@minemora.net>
Date: Mon, 9 Dec 2019 13:07:32 -0300
Subject: [PATCH] Fix crash caused by null entities

---
 .../entitytrackerfixer/entitytick/EntityTickManager.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
index dae447a..c98da86 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
@@ -66,7 +66,11 @@ public class EntityTickManager  extends TimerTask {
 				}
 				ewc.getToUntick().clear();
 				for(int i : ewc.getToTick().keySet()) {
-					ws.entitiesById.put(i, ewc.getToTick().get(i));
+					net.minecraft.server.v1_14_R1.Entity entity = ewc.getToTick().get(i);
+					if(entity == null) {
+						continue;
+					}
+					ws.entitiesById.put(i, entity);
 				}
 				ewc.getToTick().clear();
 			} catch (IllegalArgumentException | IllegalAccessException e) {