diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java index c5365630..15de64c5 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -428,7 +428,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection { if ( result.isCancelled() ) { - disconnect( result.getCancelReasonComponents() ); + BaseComponent[] reason = result.getCancelReasonComponents(); + disconnect( ( reason != null ) ? reason : TextComponent.fromLegacyText( bungee.getTranslation( "kick_message" ) ) ); return; } if ( ch.isClosed() ) @@ -551,7 +552,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection { if ( result.isCancelled() ) { - disconnect( result.getCancelReasonComponents() ); + BaseComponent[] reason = result.getCancelReasonComponents(); + disconnect( ( reason != null ) ? reason : TextComponent.fromLegacyText( bungee.getTranslation( "kick_message" ) ) ); return; } if ( ch.isClosed() )