eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protocolsupport support

Browse Source
This commit is contained in:
ayunami2000 2022-07-18 17:54:29 -04:00
parent 3f8f29d9f8
commit 782235327b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eaglercraftbungee/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@ -74,12 +74,12 @@ public class ServerConnector extends PacketHandler
@Override @Override
public void connected(final ChannelWrapper channel) throws Exception { public void connected(final ChannelWrapper channel) throws Exception {
this.ch = channel; this.ch = channel;
channel.write(this.user.getPendingConnection().getHandshake());
final ByteArrayDataOutput out = ByteStreams.newDataOutput(); final ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("Login"); out.writeUTF("Login");
out.writeUTF(this.user.getAddress().getHostString()); out.writeUTF(this.user.getAddress().getHostString());
out.writeInt(this.user.getAddress().getPort()); out.writeInt(this.user.getAddress().getPort());
channel.write(new PacketFAPluginMessage("BungeeCord", out.toByteArray())); channel.write(new PacketFAPluginMessage("BungeeCord", out.toByteArray()));
channel.write(this.user.getPendingConnection().getHandshake());
if (this.user.getPendingConnection().getForgeLogin() == null) { if (this.user.getPendingConnection().getForgeLogin() == null) {
channel.write(PacketConstants.CLIENT_LOGIN); channel.write(PacketConstants.CLIENT_LOGIN);
} }
@ -92,7 +92,8 @@ public class ServerConnector extends PacketHandler
@Override @Override
public void handle(final Packet1Login login) throws Exception { public void handle(final Packet1Login login) throws Exception {
Preconditions.checkState(this.thisState == State.LOGIN, (Object)"Not exepcting LOGIN"); Preconditions.checkState(this.thisState == State.LOGIN || this.thisState == State.ENCRYPT_REQUEST, (Object)"Not expecting LOGIN/ENCRYPT_REQUEST");
if (this.thisState == State.ENCRYPT_REQUEST) this.thisState = State.LOGIN;
final ServerConnection server = new ServerConnection(this.ch, this.target); final ServerConnection server = new ServerConnection(this.ch, this.target);
final ServerConnectedEvent event = new ServerConnectedEvent(this.user, server); final ServerConnectedEvent event = new ServerConnectedEvent(this.user, server);
this.bungee.getPluginManager().callEvent(event); this.bungee.getPluginManager().callEvent(event);