Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

JavaCollectItemTranslator: check null for entities (#1267)

Browse source
This commit is contained in:
Camotoy 2020-09-14 20:52:50 -04:00 committed by GitHub
parent 3b274ef9d1
commit 9c8eb00cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaCollectItemTranslator.java
View file

@ -41,6 +41,7 @@ public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityColl
TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket(); TakeItemEntityPacket takeItemEntityPacket = new TakeItemEntityPacket();
// Collected entity is the item // Collected entity is the item
Entity collectedEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectedEntityId()); Entity collectedEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectedEntityId());
if (collectedEntity == null) return;
// Collector is the entity picking up the item // Collector is the entity picking up the item
Entity collectorEntity; Entity collectorEntity;
if (packet.getCollectorEntityId() == session.getPlayerEntity().getEntityId()) { if (packet.getCollectorEntityId() == session.getPlayerEntity().getEntityId()) {
@ -48,6 +49,7 @@ public class JavaCollectItemTranslator extends PacketTranslator<ServerEntityColl
} else { } else {
collectorEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectorEntityId()); collectorEntity = session.getEntityCache().getEntityByJavaId(packet.getCollectorEntityId());
} }
if (collectorEntity == null) return;
takeItemEntityPacket.setRuntimeEntityId(collectorEntity.getGeyserId()); takeItemEntityPacket.setRuntimeEntityId(collectorEntity.getGeyserId());
takeItemEntityPacket.setItemRuntimeEntityId(collectedEntity.getGeyserId()); takeItemEntityPacket.setItemRuntimeEntityId(collectedEntity.getGeyserId());
session.sendUpstreamPacket(takeItemEntityPacket); session.sendUpstreamPacket(takeItemEntityPacket);