Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-23 18:55:22 +01:00
Code Issues Projects Releases Wiki Activity

Kick only in online mode: #1382

Browse Source
This commit is contained in:
md_5 2015-02-28 12:59:40 +11:00
parent e1951c5d66
commit f2673c5876
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,20 +416,23 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private void finish() private void finish()
{ {
// Check for multiple connections if ( isOnlineMode() )
// We have to check for the old name first
ProxiedPlayer oldName = bungee.getPlayer( getName() );
if ( oldName != null )
{ {
// TODO See #1218 // Check for multiple connections
oldName.disconnect( bungee.getTranslation( "already_connected" ) ); // We have to check for the old name first
} ProxiedPlayer oldName = bungee.getPlayer( getName() );
// And then also for their old UUID if ( oldName != null )
ProxiedPlayer oldID = bungee.getPlayer( getUniqueId() ); {
if ( oldID != null ) // TODO See #1218
{ oldName.disconnect( bungee.getTranslation( "already_connected" ) );
// TODO See #1218 }
oldID.disconnect( bungee.getTranslation( "already_connected" ) ); // And then also for their old UUID
ProxiedPlayer oldID = bungee.getPlayer( getUniqueId() );
if ( oldID != null )
{
// TODO See #1218
oldID.disconnect( bungee.getTranslation( "already_connected" ) );
}
} }
offlineId = java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + getName() ).getBytes( Charsets.UTF_8 ) ); offlineId = java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + getName() ).getBytes( Charsets.UTF_8 ) );