From c4658ecdae1f961a465b8388d8bfb3499d34ca0e Mon Sep 17 00:00:00 2001
From: AJ Ferguson <fergusonjva@gmail.com>
Date: Sat, 28 Dec 2019 21:45:41 -0900
Subject: [PATCH] Small changes

---
 .../translators/bedrock/BedrockRespawnTranslator.java      | 7 +++++++
 .../player/JavaPlayerPositionRotationTranslator.java       | 6 ------
 .../java/org/geysermc/connector/utils/DimensionUtils.java  | 6 ------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java
index 1a19fca15..40e97f3a3 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockRespawnTranslator.java
@@ -27,6 +27,7 @@ package org.geysermc.connector.network.translators.bedrock;
 
 import com.github.steveice10.mc.protocol.data.game.ClientRequest;
 import com.github.steveice10.mc.protocol.packet.ingame.client.ClientRequestPacket;
+import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.packet.RespawnPacket;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
@@ -36,6 +37,12 @@ public class BedrockRespawnTranslator extends PacketTranslator<RespawnPacket> {
     @Override
     public void translate(RespawnPacket packet, GeyserSession session) {
         if (packet.getSpawnState() == RespawnPacket.State.CLIENT_READY) {
+            RespawnPacket respawnPacket = new RespawnPacket();
+            respawnPacket.setRuntimeEntityId(0);
+            respawnPacket.setPosition(Vector3f.ZERO);
+            respawnPacket.setSpawnState(RespawnPacket.State.SERVER_SEARCHING);
+            session.getUpstream().sendPacket(respawnPacket);
+
             ClientRequestPacket javaRespawnPacket = new ClientRequestPacket(ClientRequest.RESPAWN);
             session.getDownstream().getSession().send(javaRespawnPacket);
         }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java
index d703c8cbd..516d14618 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java
@@ -52,12 +52,6 @@ public class JavaPlayerPositionRotationTranslator extends PacketTranslator<Serve
 
             RespawnPacket respawnPacket = new RespawnPacket();
             respawnPacket.setRuntimeEntityId(0);
-            respawnPacket.setPosition(Vector3f.ZERO);
-            respawnPacket.setSpawnState(RespawnPacket.State.SERVER_SEARCHING);
-            session.getUpstream().sendPacket(respawnPacket);
-
-            respawnPacket = new RespawnPacket();
-            respawnPacket.setRuntimeEntityId(0);
             respawnPacket.setPosition(pos);
             respawnPacket.setSpawnState(RespawnPacket.State.SERVER_READY);
             session.getUpstream().sendPacket(respawnPacket);
diff --git a/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java b/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
index 19696105b..f0a0ed584 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
@@ -28,12 +28,6 @@ public class DimensionUtils {
         stopSoundPacket.setSoundName("");
         session.getUpstream().sendPacket(stopSoundPacket);
 
-        EntityEventPacket eventPacket = new EntityEventPacket();
-        eventPacket.setRuntimeEntityId(player.getGeyserId());
-        eventPacket.setEvent(EntityEventPacket.Event.RESPAWN);
-        eventPacket.setData(0);
-        session.getUpstream().sendPacket(eventPacket);
-
         session.setSpawned(false);
         session.setSwitchingDimension(true);
     }