Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-28 19:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Add more message arguments. See #1214.

Browse Source
This commit is contained in:
Minecrell 2014-09-09 22:08:36 +02:00 committed by md_5
parent 4e3b5670a0
commit 6fcfb5aecb
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
View File

@ -39,7 +39,7 @@ public class CommandServer extends Command implements TabExecutor
Map<String, ServerInfo> servers = ProxyServer.getInstance().getServers(); Map<String, ServerInfo> servers = ProxyServer.getInstance().getServers();
if ( args.length == 0 ) if ( args.length == 0 )
{ {
player.sendMessage( ProxyServer.getInstance().getTranslation( "current_server" ) + player.getServer().getInfo().getName() ); player.sendMessage( ProxyServer.getInstance().getTranslation( "current_server", player.getServer().getInfo().getName() ) );
TextComponent serverList = new TextComponent( ProxyServer.getInstance().getTranslation( "server_list" ) ); TextComponent serverList = new TextComponent( ProxyServer.getInstance().getTranslation( "server_list" ) );
serverList.setColor( ChatColor.GOLD ); serverList.setColor( ChatColor.GOLD );
boolean first = true; boolean first = true;

2
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@ -238,7 +238,7 @@ public class ServerConnector extends PacketHandler
throw CancelSendSignal.INSTANCE; 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() ) if ( user.isDimensionChange() )
{ {
user.disconnect( message ); user.disconnect( message );

4
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -261,10 +261,10 @@ public final class UserConnection implements ProxiedPlayer
{ {
if ( dimensionChange ) if ( dimensionChange )
{ {
disconnect( bungee.getTranslation( "fallback_kick" ) + future.cause().getClass().getName() ); disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
} else } else
{ {
sendMessage( bungee.getTranslation( "fallback_kick" ) + future.cause().getClass().getName() ); sendMessage( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
} }
} }
} }

16
proxy/src/main/resources/messages.properties
View File

@ -1,19 +1,19 @@
alert=\u00a78[\u00a74Alert\u00a78]\u00a7r alert=\u00a78[\u00a74Alert\u00a78]\u00a7r
already_connected=\u00a7cYou are already connected to this server already_connected=\u00a7cYou are already connected to this server!
already_connecting=\u00a7cAlready connecting to this server! already_connecting=\u00a7cAlready connecting to this server!
command_list=\u00a7a[{0}] \u00a7e({1}): \u00a7r{2} command_list=\u00a7a[{0}] \u00a7e({1}): \u00a7r{2}
connect_kick=\u00a7cKicked whilst connecting to {0}: connect_kick=\u00a7cKicked whilst connecting to {0}: {1}
current_server=\u00a76You are currently connected to current_server=\u00a76You are currently connected to {0}.
fallback_kick=\u00a7cCould not connect to default or fallback server, please try again later: fallback_kick=\u00a7cCould not connect to default or fallback server, please try again later: {0}
fallback_lobby=\u00a7cCould not connect to target server, you have been moved to the fallback server fallback_lobby=\u00a7cCould not connect to target server, you have been moved to the fallback server.
lost_connection=[Proxy] Lost connection to server. lost_connection=[Proxy] Lost connection to server.
mojang_fail=Error occurred while contacting login servers, are they down? mojang_fail=Error occurred while contacting login servers, are they down?
no_permission=\u00a7cYou do not have permission to execute this command! no_permission=\u00a7cYou do not have permission to execute this command!
no_server=\u00a7cThe specified server does not exist no_server=\u00a7cThe specified server does not exist.
no_server_permission=\u00a7cYou don't have permission to access this server no_server_permission=\u00a7cYou don't have permission to access this server.
outdated_client=Outdated Client! outdated_client=Outdated Client!
outdated_server=Outdated Server! outdated_server=Outdated Server!
proxy_full=Server is full proxy_full=Server is full!
restart=[Proxy] Proxy restarting. restart=[Proxy] Proxy restarting.
server_kick=[Kicked] server_kick=[Kicked]
server_list=\u00a76You may connect to the following servers at this time: server_list=\u00a76You may connect to the following servers at this time: