BedrockEmoteTranslator: ensure sending player is valid for all other …

…sessions (GeyserMC#1194)
victim59 · Aug 24, 2020 · aaa3d72 · aaa3d72
1 parent 8b7165a
commit aaa3d72
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.../geysermc/connector/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java b/.../geysermc/connector/network/translators/bedrock/entity/player/BedrockEmoteTranslator.java
@@ -26,7 +26,7 @@
 package org.geysermc.connector.network.translators.bedrock.entity.player;
 
 import com.nukkitx.protocol.bedrock.packet.EmotePacket;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.entity.Entity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
@@ -37,9 +37,12 @@ public class BedrockEmoteTranslator extends PacketTranslator<EmotePacket> {
     @Override
     public void translate(EmotePacket packet, GeyserSession session) {
         long javaId = session.getPlayerEntity().getEntityId();
-        for (GeyserSession otherSession : GeyserConnector.getInstance().getPlayers()) {
+        for (GeyserSession otherSession : session.getConnector().getPlayers()) {
             if (otherSession != session) {
-                packet.setRuntimeEntityId(otherSession.getEntityCache().getEntityByJavaId(javaId).getGeyserId());
+                if (otherSession.isClosed()) continue;
+                Entity otherEntity = otherSession.getEntityCache().getEntityByJavaId(javaId);
+                if (otherEntity == null) continue;
+                packet.setRuntimeEntityId(otherEntity.getGeyserId());
                 otherSession.sendUpstreamPacket(packet);
             }
         }