From fb1cab499dede03b74bf83843aaea850657c1f3e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 12 Jul 2013 09:29:53 +1000
Subject: [PATCH] Always use eventloop since we cannot be sure about plugins,
 thanks @MonsieurApple for the report.

---
 .../bungee/connection/InitialHandler.java     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

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 879403239..794243c70 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
@@ -303,15 +303,23 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                 }
                 thisState = InitialHandler.State.LOGIN;
 
-                unsafe().sendPacket( new PacketFCEncryptionResponse( new byte[ 0 ], new byte[ 0 ] ) );
-                try
+                ch.getHandle().eventLoop().execute( new Runnable()
                 {
-                    Cipher encrypt = EncryptionUtil.getCipher( Cipher.ENCRYPT_MODE, sharedKey );
-                    ch.addBefore( PipelineUtils.DECRYPT_HANDLER, PipelineUtils.ENCRYPT_HANDLER, new CipherEncoder( encrypt ) );
-                } catch ( GeneralSecurityException ex )
-                {
-                    disconnect( "Cipher error: " + Util.exception( ex ) );
-                }
+                    @Override
+                    public void run()
+                    {
+
+                        unsafe().sendPacket( new PacketFCEncryptionResponse( new byte[ 0 ], new byte[ 0 ] ) );
+                        try
+                        {
+                            Cipher encrypt = EncryptionUtil.getCipher( Cipher.ENCRYPT_MODE, sharedKey );
+                            ch.addBefore( PipelineUtils.DECRYPT_HANDLER, PipelineUtils.ENCRYPT_HANDLER, new CipherEncoder( encrypt ) );
+                        } catch ( GeneralSecurityException ex )
+                        {
+                            disconnect( "Cipher error: " + Util.exception( ex ) );
+                        }
+                    }
+                } );
             }
         };