From 089a8dd31173c63fb1e7f4c075e5d1750f3ddf68 Mon Sep 17 00:00:00 2001 From: Melair Date: Mon, 28 Jul 2014 22:10:03 +0100 Subject: [PATCH] Allow customisation of kicking during initial server connection. In particular allow removal of server name by modification of messages.properties. --- proxy/src/main/java/net/md_5/bungee/ServerConnector.java | 2 +- proxy/src/main/resources/messages.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java index 3d342f84..4f451d26 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -217,7 +217,7 @@ public class ServerConnector extends PacketHandler throw CancelSendSignal.INSTANCE; } - String message = bungee.getTranslation( "connect_kick" ) + target.getName() + ": " + event.getKickReason(); + String message = bungee.getTranslation( "connect_kick", target.getName() ) + event.getKickReason(); if ( user.isDimensionChange() ) { user.disconnect( message ); diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties index 3d634049..154dd91b 100644 --- a/proxy/src/main/resources/messages.properties +++ b/proxy/src/main/resources/messages.properties @@ -2,7 +2,7 @@ alert=\u00a78[\u00a74Alert\u00a78]\u00a7r already_connected=\u00a7cYou are already connected to this server already_connecting=\u00a7cAlready connecting to this server! command_list=\u00a7a[{0}] \u00a7e({1}): \u00a7r{2} -connect_kick=\u00a7cKicked whilst connecting to +connect_kick=\u00a7cKicked whilst connecting to {0}: current_server=\u00a76You are currently connected to fallback_kick=\u00a7cCould not connect to default or fallback server, please try again later: fallback_lobby=\u00a7cCould not connect to target server, you have been moved to the fallback server