GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge branch 'crash-fix' of https://github.com/GeyserMC/Geyser into crash-fix

Browse source 
# Conflicts:
#	connector/pom.xml
#	connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
#	connector/src/main/java/org/geysermc/connector/network/translators/Registry.java
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
This commit is contained in:
Logicism 2019-07-21 18:22:01 -07:00
parent b2413f2d9a
commit 0daa37eb67
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -27,14 +27,17 @@ package org.geysermc.connector.network.session;
import com.github.steveice10.mc.protocol.MinecraftProtocol; import com.github.steveice10.mc.protocol.MinecraftProtocol;
import com.github.steveice10.packetlib.Client; import com.github.steveice10.packetlib.Client;
import com.github.steveice10.mc.auth.exception.request.RequestException;
import com.github.steveice10.packetlib.event.session.ConnectedEvent; import com.github.steveice10.packetlib.event.session.ConnectedEvent;
import com.github.steveice10.packetlib.event.session.DisconnectedEvent; import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
import com.github.steveice10.packetlib.event.session.PacketReceivedEvent; import com.github.steveice10.packetlib.event.session.PacketReceivedEvent;
import com.github.steveice10.packetlib.event.session.SessionAdapter; import com.github.steveice10.packetlib.event.session.SessionAdapter;
import com.github.steveice10.packetlib.tcp.TcpSessionFactory; import com.github.steveice10.packetlib.tcp.TcpSessionFactory;
import com.nukkitx.network.util.DisconnectReason; import com.nukkitx.network.util.DisconnectReason;
import com.nukkitx.protocol.MinecraftSession;
import com.nukkitx.protocol.PlayerSession; import com.nukkitx.protocol.PlayerSession;
import com.nukkitx.protocol.bedrock.BedrockServerSession; import com.nukkitx.protocol.bedrock.BedrockServerSession;
import com.nukkitx.protocol.bedrock.packet.AdventureSettingsPacket;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.GeyserConnector;
@ -67,7 +70,12 @@ public class GeyserSession implements PlayerSession {
} }
public void connect(RemoteJavaServer remoteServer) { public void connect(RemoteJavaServer remoteServer) {
MinecraftProtocol protocol = new MinecraftProtocol(authenticationData.getName()); MinecraftProtocol protocol = null;
try {
protocol = new MinecraftProtocol(connector.getConfig().getRemote().getEmail(), connector.getConfig().getRemote().getPassword());
} catch (RequestException e) {
e.printStackTrace();
}
downstream = new Client(remoteServer.getAddress(), remoteServer.getPort(), protocol, new TcpSessionFactory()); downstream = new Client(remoteServer.getAddress(), remoteServer.getPort(), protocol, new TcpSessionFactory());
downstream.getSession().addListener(new SessionAdapter() { downstream.getSession().addListener(new SessionAdapter() {
@ -123,6 +131,10 @@ public class GeyserSession implements PlayerSession {
authenticationData = new AuthenticationData(name, uuid, xboxUUID); authenticationData = new AuthenticationData(name, uuid, xboxUUID);
} }
public BedrockServerSession getUpstream() {
return upstream;
}
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public class AuthenticationData { public class AuthenticationData {