PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent

Browse Source
This commit is contained in:
Outfluencer 2022-07-12 21:47:57 +10:00 committed by md_5
parent 587fb37bdf
commit 12e4514813
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{ {
if ( result.isCancelled() ) if ( result.isCancelled() )
{ {
disconnect( result.getCancelReasonComponents() ); BaseComponent[] reason = result.getCancelReasonComponents();
disconnect( ( reason != null ) ? reason : TextComponent.fromLegacyText( bungee.getTranslation( "kick_message" ) ) );
return; return;
} }
if ( ch.isClosed() ) if ( ch.isClosed() )
@ -551,7 +552,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{ {
if ( result.isCancelled() ) if ( result.isCancelled() )
{ {
disconnect( result.getCancelReasonComponents() ); BaseComponent[] reason = result.getCancelReasonComponents();
disconnect( ( reason != null ) ? reason : TextComponent.fromLegacyText( bungee.getTranslation( "kick_message" ) ) );
return; return;
} }
if ( ch.isClosed() ) if ( ch.isClosed() )