From 9c8eb00cd59d9272314d2b127bab3c6b5ed02bc8 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Mon, 14 Sep 2020 20:52:50 -0400
Subject: [PATCH] JavaCollectItemTranslator: check null for entities (#1267)

---
 .../translators/java/world/JavaCollectItemTranslator.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java
index 31379bd2..a90c7016 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java
@@ -41,6 +41,7 @@ public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityColl
         TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket();
         // Collected entity is the item
         Entity collectedEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectedEntityId());
+        if (collectedEntity == null) return;
         // Collector is the entity picking up the item
         Entity collectorEntity;
         if (packet.getCollectorEntityId() == session.getPlayerEntity().getEntityId()) {
@@ -48,6 +49,7 @@ public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityColl
         } else {
             collectorEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectorEntityId());
         }
+        if (collectorEntity == null) return;
         takeItemEntityPacket.setRuntimeEntityId(collectorEntity.getGeyserId());
         takeItemEntityPacket.setItemRuntimeEntityId(collectedEntity.getGeyserId());
         session.sendUpstreamPacket(takeItemEntityPacket);