From 3ced0b675dca008e94d382bb646f64a8f2592e4b Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:38:15 +1000 Subject: [PATCH] Implement Skin forwarding - YOU MUST UPDATE SPIGOT FIRST --- .../main/java/net/md_5/bungee/ServerConnector.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 7cd5cf14..ca72ed58 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -16,6 +16,7 @@ import net.md_5.bungee.api.score.Team; import net.md_5.bungee.chat.ComponentSerializer; import net.md_5.bungee.connection.CancelSendSignal; import net.md_5.bungee.connection.DownstreamBridge; +import net.md_5.bungee.connection.LoginResult; import net.md_5.bungee.netty.HandlerBoss; import net.md_5.bungee.netty.ChannelWrapper; import net.md_5.bungee.netty.PacketHandler; @@ -67,9 +68,17 @@ public class ServerConnector extends PacketHandler Handshake originalHandshake = user.getPendingConnection().getHandshake(); Handshake copiedHandshake = new Handshake( originalHandshake.getProtocolVersion(), originalHandshake.getHost(), originalHandshake.getPort(), 2 ); + if ( BungeeCord.getInstance().config.isIpFoward() ) { - copiedHandshake.setHost( copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID() ); + String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID(); + + LoginResult profile = user.getPendingConnection().getLoginProfile(); + if ( profile != null && profile.getProperties() != null && profile.getProperties().length > 0 ) + { + newHost += "\00" + BungeeCord.getInstance().gson.toJson( profile.getProperties() ); + } + copiedHandshake.setHost( newHost ); } channel.write( copiedHandshake );