PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Fire events + plugin channels in server login

Browse Source
This commit is contained in:
md_5 2013-02-16 10:21:35 +11:00
parent 190e5109cf
commit feb64312ca
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,11 @@ package net.md_5.bungee;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
import java.util.Queue;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.event.ServerConnectedEvent;
import net.md_5.bungee.packet.DefinedPacket; import net.md_5.bungee.packet.DefinedPacket;
import net.md_5.bungee.packet.Packet1Login; import net.md_5.bungee.packet.Packet1Login;
import net.md_5.bungee.packet.PacketCDClientStatus; import net.md_5.bungee.packet.PacketCDClientStatus;
@ -46,13 +48,13 @@ public class ServerConnector extends PacketHandler
thisState = State.LOGIN; thisState = State.LOGIN;
} }
public static ServerConnection connect(UserConnection user, ServerInfo server, boolean retry) public static ServerConnection connect(UserConnection user, ServerInfo info, boolean retry)
{ {
Socket socket = null; Socket socket = null;
try try
{ {
socket = new Socket(); socket = new Socket();
socket.connect( server.getAddress(), BungeeCord.getInstance().config.getTimeout() ); socket.connect( info.getAddress(), BungeeCord.getInstance().config.getTimeout() );
BungeeCord.getInstance().setSocketOptions( socket ); BungeeCord.getInstance().setSocketOptions( socket );
PacketStream stream = new PacketStream( socket.getInputStream(), socket.getOutputStream(), user.stream.getProtocol() ); PacketStream stream = new PacketStream( socket.getInputStream(), socket.getOutputStream(), user.stream.getProtocol() );
@ -67,7 +69,18 @@ public class ServerConnector extends PacketHandler
packet.handle( connector ); packet.handle( connector );
} }
return new ServerConnection( socket, server, stream, connector.loginPacket ); ServerConnection server = new ServerConnection( socket, info, stream, connector.loginPacket );
ServerConnectedEvent event = new ServerConnectedEvent( user, server );
ProxyServer.getInstance().getPluginManager().callEvent( event );
stream.write( BungeeCord.getInstance().registerChannels() );
Queue<DefinedPacket> packetQueue = ( (BungeeServerInfo) info ).getPacketQueue();
while ( !packetQueue.isEmpty() )
{
stream.write( packetQueue.poll() );
}
return server;
} catch ( Exception ex ) } catch ( Exception ex )
{ {
if ( socket != null ) if ( socket != null )
@ -80,7 +93,7 @@ public class ServerConnector extends PacketHandler
} }
} }
ServerInfo def = ProxyServer.getInstance().getServers().get( user.getPendingConnection().getListener().getDefaultServer() ); ServerInfo def = ProxyServer.getInstance().getServers().get( user.getPendingConnection().getListener().getDefaultServer() );
if ( retry && !server.equals( def ) ) if ( retry && !info.equals( def ) )
{ {
user.sendMessage( ChatColor.RED + "Could not connect to target server, you have been moved to the default server" ); user.sendMessage( ChatColor.RED + "Could not connect to target server, you have been moved to the default server" );
return connect( user, def, false ); return connect( user, def, false );