From ebff48ff867da8539a5017bbbb44643426da6919 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 28 Apr 2013 10:27:13 +1000 Subject: [PATCH] Remove remnants of forge in initial handler --- .../main/java/net/md_5/bungee/UserConnection.java | 1 - .../net/md_5/bungee/connection/InitialHandler.java | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index 5a519ca9..c7b99513 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -43,7 +43,6 @@ public final class UserConnection implements ProxiedPlayer @Getter private final PendingConnection pendingConnection; public final Packet2Handshake handshake; - final Packet1Login forgeLogin; final List loginMessages; /*========================================================================*/ @Getter 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 4b2331e5..879b2f21 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 @@ -52,7 +52,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection private ChannelWrapper ch; @Getter private final ListenerInfo listener; - private Packet1Login forgeLogin; // TODO: Remove for now? private Packet2Handshake handshake; private PacketFDEncryptionRequest request; private List loginMessages = new ArrayList<>(); @@ -78,16 +77,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection disconnect( ChatColor.RED + Util.exception( t ) ); } - @Override - public void handle(Packet1Login login) throws Exception - { - Preconditions.checkState( thisState == State.LOGIN, "Not expecting FORGE LOGIN" ); - Preconditions.checkState( forgeLogin == null, "Already received FORGE LOGIN" ); - forgeLogin = login; - - ch.getHandle().pipeline().get( PacketDecoder.class ).setProtocol( PacketDefinitions.FORGE_PROTOCOL ); - } - @Override public void handle(PacketFAPluginMessage pluginMessage) throws Exception { @@ -223,7 +212,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection { Preconditions.checkState( thisState == State.LOGIN, "Not expecting LOGIN" ); - UserConnection userCon = new UserConnection( (BungeeCord) bungee, ch, this, handshake, forgeLogin, loginMessages ); + UserConnection userCon = new UserConnection( (BungeeCord) bungee, ch, this, handshake, loginMessages ); userCon.init(); bungee.getPluginManager().callEvent( new PostLoginEvent( userCon ) );