PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Added getKickedFrom() to ServerKickEvent.

Browse Source
This commit is contained in:
maciekmm 2014-06-22 17:11:27 +10:00 committed by md_5
parent e849afbb23
commit 4d1f0cbb26
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
View File

@ -27,6 +27,11 @@ public class ServerKickEvent extends Event implements Cancellable
* Player being kicked. * Player being kicked.
*/ */
private final ProxiedPlayer player; private final ProxiedPlayer player;
/**
* The server the player was kicked from, should be used in preference to
* {@link ProxiedPlayer#getServer()}.
*/
private final ServerInfo kickedFrom;
/** /**
* Kick reason. * Kick reason.
*/ */
@ -46,14 +51,22 @@ public class ServerKickEvent extends Event implements Cancellable
CONNECTING, CONNECTED, UNKNOWN; CONNECTING, CONNECTED, UNKNOWN;
} }
@Deprecated
public ServerKickEvent(ProxiedPlayer player, BaseComponent[] kickReasonComponent, ServerInfo cancelServer) public ServerKickEvent(ProxiedPlayer player, BaseComponent[] kickReasonComponent, ServerInfo cancelServer)
{ {
this( player, kickReasonComponent, cancelServer, State.UNKNOWN ); this( player, kickReasonComponent, cancelServer, State.UNKNOWN );
} }
@Deprecated
public ServerKickEvent(ProxiedPlayer player, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state) public ServerKickEvent(ProxiedPlayer player, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state)
{
this( player, player.getServer().getInfo(), kickReasonComponent, cancelServer, state );
}
public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state)
{ {
this.player = player; this.player = player;
this.kickedFrom = kickedFrom;
this.kickReasonComponent = kickReasonComponent; this.kickReasonComponent = kickReasonComponent;
this.cancelServer = cancelServer; this.cancelServer = cancelServer;
this.state = state; this.state = state;

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

@ -210,7 +210,7 @@ public class ServerConnector extends PacketHandler
{ {
def = null; def = null;
} }
ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( user, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTING ) ); ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( user, target, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTING ) );
if ( event.isCancelled() && event.getCancelServer() != null ) if ( event.isCancelled() && event.getCancelServer() != null )
{ {
user.connect( event.getCancelServer() ); user.connect( event.getCancelServer() );

2
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -383,7 +383,7 @@ public class DownstreamBridge extends PacketHandler
{ {
def = null; def = null;
} }
ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) ); ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
if ( event.isCancelled() && event.getCancelServer() != null ) if ( event.isCancelled() && event.getCancelServer() != null )
{ {
con.connectNow( event.getCancelServer() ); con.connectNow( event.getCancelServer() );