Merge pull request #35 from SpigotMC/master

[pull] master from SpigotMC:master

Author: pull[bot]

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

@@ -382,4 +382,12 @@ public enum MainHand
      */
     @ApiStatus.Experimental
     void transfer(String host, int port);
+
+    /**
+     * Gets the client brand of this player.
+     * If the player has not sent a brand packet yet, it will return null.
+     *
+     * @return the brand of the client, or null if not received yet
+     */
+    String getClientBrand();
 }

proxy/src/main/java/net/md_5/bungee/UserConnection.java

@@ -778,6 +778,11 @@ public String getExtraDataInHandshake()
         return this.getPendingConnection().getExtraDataInHandshake();
     }
 
+    public String getClientBrand()
+    {
+        return getPendingConnection().getClientBrand();
+    }
+
     public void setCompressionThreshold(int compressionThreshold)
     {
         if ( !ch.isClosing() && this.compressionThreshold == -1 && compressionThreshold >= 0 )

proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java

@@ -2,6 +2,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.gson.Gson;
+import io.netty.buffer.Unpooled;
 import java.math.BigInteger;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -97,6 +98,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     @Getter
     private PluginMessage brandMessage;
     @Getter
+    private String clientBrand;
+    @Getter
     private final Set<String> registeredChannels = new HashSet<>();
     private State thisState = State.HANDSHAKE;
     private int loginPayloadId;
@@ -849,6 +852,7 @@ public void relayMessage(PluginMessage input) throws Exception
         } else if ( input.getTag().equals( "MC|Brand" ) || input.getTag().equals( "minecraft:brand" ) )
         {
             brandMessage = input;
+            clientBrand = DefinedPacket.readString( Unpooled.wrappedBuffer( input.getData() ) );
         }
     }