PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Don't allow duplicate UUIDs on the proxy.

Browse Source
This commit is contained in:
md_5 2015-02-14 18:26:27 +11:00
parent 668cdabdf7
commit 3776feb559
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
// If offline mode and they are already on, don't allow connect
if ( !isOnlineMode() && bungee.getPlayer( getName() ) != null )
// We can just check by UUID here as names are based on UUID
if ( !isOnlineMode() && bungee.getPlayer( getUniqueId() ) != null )
{
disconnect( bungee.getTranslation( "already_connected" ) );
return;
@ -416,11 +417,19 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private void finish()
{
// Check for multiple connections
ProxiedPlayer old = bungee.getPlayer( getName() );
if ( old != null )
// We have to check for the old name first
ProxiedPlayer oldName = bungee.getPlayer( getName() );
if ( oldName != null )
{
// TODO See #1218
old.disconnect( bungee.getTranslation( "already_connected" ) );
oldName.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 ) );