From 35a5230b52b9b054cdc13c46b6480710ff77d9c3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Feb 2014 10:35:02 +1100 Subject: [PATCH] Remove artifacts from legacy forge support. --- .../java/net/md_5/bungee/ServerConnector.java | 5 ----- .../bungee/connection/InitialHandler.java | 20 ------------------- .../bungee/connection/UpstreamBridge.java | 6 ------ 3 files changed, 31 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java index b39082b1..4ec72f33 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -120,11 +120,6 @@ public class ServerConnector extends PacketHandler } } - for ( PluginMessage message : user.getPendingConnection().getRegisterMessages() ) - { - ch.write( message ); - } - if ( user.getSettings() != null ) { ch.write( user.getSettings() ); diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index 1d87d2b0..6d0da055 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -6,8 +6,6 @@ import java.math.BigInteger; import java.net.InetSocketAddress; import java.net.URLEncoder; import java.security.MessageDigest; -import java.util.ArrayList; -import java.util.List; import java.util.logging.Level; import javax.crypto.SecretKey; 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.packet.Login; 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.EncryptionRequest; import net.md_5.bungee.protocol.packet.Kick; @@ -68,10 +65,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Getter private LoginRequest loginRequest; private EncryptionRequest request; - @Getter - private List loginMessages = new ArrayList<>(); - @Getter - private List registerMessages = new ArrayList<>(); private State thisState = State.HANDSHAKE; private SecretKey sharedKey; private final Unsafe unsafe = new Unsafe() @@ -108,19 +101,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection 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 public void handle(LegacyHandshake legacyHandshake) throws Exception { diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java index 674e8e12..5786c87f 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java @@ -133,12 +133,6 @@ public class UpstreamBridge extends PacketHandler { throw new CancelSendSignal(); } - - // TODO: Unregister as well? - if ( pluginMessage.getTag().equals( "REGISTER" ) ) - { - con.getPendingConnection().getRegisterMessages().add( pluginMessage ); - } } @Override