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

Add comment and check for null when removing passengers

Browse source
This commit is contained in:
DoctorMacc 2020-07-04 10:26:32 -04:00
parent da96a5b19c
commit a7fbe995f8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
connector/src/main/java/org/geysermc/connector/entity/Entity.java
View file

@ -146,9 +146,10 @@ public class Entity {
public boolean despawnEntity(GeyserSession session) { public boolean despawnEntity(GeyserSession session) {
if (!valid) return true; if (!valid) return true;
for (long passenger : passengers) { for (long passenger : passengers) { // Make sure all passengers on the despawned entity are updated
Entity entity = session.getEntityCache().getEntityByJavaId(passenger); Entity entity = session.getEntityCache().getEntityByJavaId(passenger);
entity.getMetadata().getFlags().setFlag(EntityFlag.RIDING, false); if (entity == null) continue;
entity.getMetadata().getOrCreateFlags().setFlag(EntityFlag.RIDING, false);
entity.updateBedrockMetadata(session); entity.updateBedrockMetadata(session);
} }