PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Make the ServerConnectedEvent async to allow stalling it. Closes #538 by @BjoernAkAManf.

Browse Source
This commit is contained in:
md_5 2013-08-03 20:09:20 +10:00
parent 4463b0c1b2
commit f07cfe0cf7
2 changed files with 119 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/main/java/net/md_5/bungee/api/event/ServerConnectedEvent.java
View File

@ -3,9 +3,9 @@ package net.md_5.bungee.api.event;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.connection.Server; import net.md_5.bungee.api.connection.Server;
import net.md_5.bungee.api.plugin.Event;
/** /**
* Not to be confused with {@link ServerConnectEvent}, this event is called once * Not to be confused with {@link ServerConnectEvent}, this event is called once
@ -16,7 +16,7 @@ import net.md_5.bungee.api.plugin.Event;
@Data @Data
@ToString(callSuper = false) @ToString(callSuper = false)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class ServerConnectedEvent extends Event public class ServerConnectedEvent extends AsyncEvent<ServerConnectedEvent>
{ {
/** /**
@ -27,4 +27,11 @@ public class ServerConnectedEvent extends Event
* The server itself. * The server itself.
*/ */
private final Server server; private final Server server;
public ServerConnectedEvent(ProxiedPlayer player, Server server, Callback<ServerConnectedEvent> done)
{
super( done );
this.player = player;
this.server = server;
}
} }

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

@ -10,6 +10,7 @@ import java.util.Queue;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.Callback;
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;
@ -99,13 +100,16 @@ public class ServerConnector extends PacketHandler
} }
@Override @Override
public void handle(Packet1Login login) throws Exception public void handle(final Packet1Login login) throws Exception
{ {
Preconditions.checkState( thisState == State.LOGIN, "Not exepcting LOGIN" ); Preconditions.checkState( thisState == State.LOGIN, "Not exepcting LOGIN" );
ServerConnection server = new ServerConnection( ch, target ); final ServerConnection server = new ServerConnection( ch, target );
ServerConnectedEvent event = new ServerConnectedEvent( user, server ); Callback<ServerConnectedEvent> callback = new Callback<ServerConnectedEvent>()
bungee.getPluginManager().callEvent( event ); {
@Override
public void done(ServerConnectedEvent result, Throwable error)
{
ch.write( BungeeCord.getInstance().registerChannels() ); ch.write( BungeeCord.getInstance().registerChannels() );
Queue<DefinedPacket> packetQueue = target.getPacketQueue(); Queue<DefinedPacket> packetQueue = target.getPacketQueue();
@ -204,6 +208,11 @@ public class ServerConnector extends PacketHandler
bungee.getPluginManager().callEvent( new ServerSwitchEvent( user ) ); bungee.getPluginManager().callEvent( new ServerSwitchEvent( user ) );
thisState = State.FINISHED; thisState = State.FINISHED;
}
};
ServerConnectedEvent event = new ServerConnectedEvent( user, server, callback );
bungee.getPluginManager().callEvent( event );
throw new CancelSendSignal(); throw new CancelSendSignal();
} }