PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Remove remnants of forge in initial handler

Browse Source
This commit is contained in:
md_5 2013-04-28 10:27:13 +10:00
parent 6efba44e5a
commit ebff48ff86
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -43,7 +43,6 @@ public final class UserConnection implements ProxiedPlayer
@Getter @Getter
private final PendingConnection pendingConnection; private final PendingConnection pendingConnection;
public final Packet2Handshake handshake; public final Packet2Handshake handshake;
final Packet1Login forgeLogin;
final List<PacketFAPluginMessage> loginMessages; final List<PacketFAPluginMessage> loginMessages;
/*========================================================================*/ /*========================================================================*/
@Getter @Getter

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

@ -52,7 +52,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private ChannelWrapper ch; private ChannelWrapper ch;
@Getter @Getter
private final ListenerInfo listener; private final ListenerInfo listener;
private Packet1Login forgeLogin; // TODO: Remove for now?
private Packet2Handshake handshake; private Packet2Handshake handshake;
private PacketFDEncryptionRequest request; private PacketFDEncryptionRequest request;
private List<PacketFAPluginMessage> loginMessages = new ArrayList<>(); private List<PacketFAPluginMessage> loginMessages = new ArrayList<>();
@ -78,16 +77,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
disconnect( ChatColor.RED + Util.exception( t ) ); 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 @Override
public void handle(PacketFAPluginMessage pluginMessage) throws Exception 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" ); 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(); userCon.init();
bungee.getPluginManager().callEvent( new PostLoginEvent( userCon ) ); bungee.getPluginManager().callEvent( new PostLoginEvent( userCon ) );