Restore port to the hostname. Fixes BUKKIT-2124

src/main/java/net/minecraft/server/NetLoginHandler.java

@@ -61,7 +61,7 @@ public class NetLoginHandler extends NetHandler {
 
     public void a(Packet2Handshake packet2handshake) {
         // CraftBukkit start
-        this.hostname = packet2handshake.c == null ? "" : packet2handshake.c;
+        this.hostname = packet2handshake.c == null ? "" : packet2handshake.c + ':' + packet2handshake.d;
         // CraftBukkit end
         this.h = packet2handshake.f();
         if (!this.h.equals(StripColor.a(this.h))) {

src/main/java/net/minecraft/server/Packet2Handshake.java

@@ -10,7 +10,7 @@ public class Packet2Handshake extends Packet {
     private int a;
     private String b;
     public String c; // CraftBukkit private -> public
-    private int d;
+    public int d; // CraftBukkit private -> public
 
     public Packet2Handshake() {}