Remove artifacts from legacy forge support.
This commit is contained in:
parent
90fcfecb7c
commit
35a5230b52
@ -120,11 +120,6 @@ public class ServerConnector extends PacketHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( PluginMessage message : user.getPendingConnection().getRegisterMessages() )
|
|
||||||
{
|
|
||||||
ch.write( message );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( user.getSettings() != null )
|
if ( user.getSettings() != null )
|
||||||
{
|
{
|
||||||
ch.write( user.getSettings() );
|
ch.write( user.getSettings() );
|
||||||
|
@ -6,8 +6,6 @@ import java.math.BigInteger;
|
|||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import javax.crypto.SecretKey;
|
import javax.crypto.SecretKey;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@ -37,7 +35,6 @@ import net.md_5.bungee.netty.cipher.CipherEncoder;
|
|||||||
import net.md_5.bungee.protocol.DefinedPacket;
|
import net.md_5.bungee.protocol.DefinedPacket;
|
||||||
import net.md_5.bungee.protocol.packet.Login;
|
import net.md_5.bungee.protocol.packet.Login;
|
||||||
import net.md_5.bungee.protocol.packet.Handshake;
|
import net.md_5.bungee.protocol.packet.Handshake;
|
||||||
import net.md_5.bungee.protocol.packet.PluginMessage;
|
|
||||||
import net.md_5.bungee.protocol.packet.EncryptionResponse;
|
import net.md_5.bungee.protocol.packet.EncryptionResponse;
|
||||||
import net.md_5.bungee.protocol.packet.EncryptionRequest;
|
import net.md_5.bungee.protocol.packet.EncryptionRequest;
|
||||||
import net.md_5.bungee.protocol.packet.Kick;
|
import net.md_5.bungee.protocol.packet.Kick;
|
||||||
@ -68,10 +65,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|||||||
@Getter
|
@Getter
|
||||||
private LoginRequest loginRequest;
|
private LoginRequest loginRequest;
|
||||||
private EncryptionRequest request;
|
private EncryptionRequest request;
|
||||||
@Getter
|
|
||||||
private List<PluginMessage> loginMessages = new ArrayList<>();
|
|
||||||
@Getter
|
|
||||||
private List<PluginMessage> registerMessages = new ArrayList<>();
|
|
||||||
private State thisState = State.HANDSHAKE;
|
private State thisState = State.HANDSHAKE;
|
||||||
private SecretKey sharedKey;
|
private SecretKey sharedKey;
|
||||||
private final Unsafe unsafe = new Unsafe()
|
private final Unsafe unsafe = new Unsafe()
|
||||||
@ -108,19 +101,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|||||||
disconnect( ChatColor.RED + Util.exception( t ) );
|
disconnect( ChatColor.RED + Util.exception( t ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void handle(PluginMessage pluginMessage) throws Exception
|
|
||||||
{
|
|
||||||
// TODO: Unregister?
|
|
||||||
if ( pluginMessage.getTag().equals( "REGISTER" ) )
|
|
||||||
{
|
|
||||||
registerMessages.add( pluginMessage );
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
loginMessages.add( pluginMessage );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handle(LegacyHandshake legacyHandshake) throws Exception
|
public void handle(LegacyHandshake legacyHandshake) throws Exception
|
||||||
{
|
{
|
||||||
|
@ -133,12 +133,6 @@ public class UpstreamBridge extends PacketHandler
|
|||||||
{
|
{
|
||||||
throw new CancelSendSignal();
|
throw new CancelSendSignal();
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Unregister as well?
|
|
||||||
if ( pluginMessage.getTag().equals( "REGISTER" ) )
|
|
||||||
{
|
|
||||||
con.getPendingConnection().getRegisterMessages().add( pluginMessage );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user