PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Don't send/construct redundant kick messages

Browse Source
This commit is contained in:
md_5 2020-01-29 11:05:38 +11:00
parent e9ba95b9dc
commit 1dee049007
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,6 +118,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
HANDSHAKE, STATUS, PING, USERNAME, ENCRYPT, FINISHED; HANDSHAKE, STATUS, PING, USERNAME, ENCRYPT, FINISHED;
} }
private boolean canSendKickMessage()
{
return thisState == State.USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHED;
}
@Override @Override
public void connected(ChannelWrapper channel) throws Exception public void connected(ChannelWrapper channel) throws Exception
{ {
@ -126,8 +131,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public void exception(Throwable t) throws Exception public void exception(Throwable t) throws Exception
{
if ( canSendKickMessage() )
{ {
disconnect( ChatColor.RED + Util.exception( t ) ); disconnect( ChatColor.RED + Util.exception( t ) );
} else
{
ch.close();
}
} }
@Override @Override
@ -557,14 +568,20 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public void disconnect(String reason) public void disconnect(String reason)
{
if ( canSendKickMessage() )
{ {
disconnect( TextComponent.fromLegacyText( reason ) ); disconnect( TextComponent.fromLegacyText( reason ) );
} else
{
ch.close();
}
} }
@Override @Override
public void disconnect(final BaseComponent... reason) public void disconnect(final BaseComponent... reason)
{ {
if ( thisState != State.STATUS && thisState != State.PING && thisState != State.HANDSHAKE ) if ( canSendKickMessage() )
{ {
ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) ); ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
} else } else