Set SessionData

bundabrg · Aug 16, 2020 · 6e45ada · 6e45ada
1 parent d8f7553
commit 6e45ada
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/...u/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java b/...u/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java
@@ -20,24 +20,33 @@
 
 import au.com.grieve.reversion.LoginData;
 import au.com.grieve.reversion.ReversionServerSession;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.packet.LoginPacket;
 import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket;
 import com.nukkitx.protocol.bedrock.packet.ResourcePacksInfoPacket;
 import com.nukkitx.protocol.bedrock.packet.ServerToClientHandshakePacket;
+import lombok.Getter;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.BedrockProtocol;
 import org.geysermc.connector.network.UpstreamPacketHandler;
 import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.session.auth.AuthData;
+import org.geysermc.connector.network.session.auth.BedrockClientData;
 import org.geysermc.connector.utils.LanguageUtils;
 
+import java.util.UUID;
 
+
+@Getter
 public class BedrockUpstreamPacketHandler extends UpstreamPacketHandler {
     private final ReversionServerSession serverSession;
+    private final GeyserSession geyserSession;
 
     public BedrockUpstreamPacketHandler(ReversionServerSession serverSession, GeyserConnector connector, GeyserSession session) {
         super(connector, session);
         this.serverSession = serverSession;
+        this.geyserSession = session;
     }
 
     @Override
@@ -68,6 +77,17 @@ public boolean handle(LoginPacket loginPacket) {
             session.getConnector().getLogger().error("Failed to encrypt connection", e);
         }
 
+        // Setup Session
+        JsonNode extraData = serverSession.getLoginData().getPayload().get("extraData");
+        geyserSession.setAuthenticationData(new AuthData(
+                extraData.get("displayName").asText(),
+                UUID.fromString(extraData.get("identity").asText()),
+                extraData.get("XUID").asText()
+        ));
+
+        serverSession.getLoginData();
+        session.setClientData(LoginData.JSON_MAPPER.convertValue(serverSession.getLoginData().getClientData(), BedrockClientData.class));
+
         PlayStatusPacket playStatus = new PlayStatusPacket();
         playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS);
         session.sendUpstreamPacket(playStatus);