PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Remove artifacts from legacy forge support.

Browse Source
This commit is contained in:
md_5 2014-02-01 10:35:02 +11:00
parent 90fcfecb7c
commit 35a5230b52
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() );

20
proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
View File

@ -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
{ {

6
proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View File

@ -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