From 25fe93479f6fdd20a1ea2c22605eed16a7be7075 Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Wed, 8 Aug 2012 06:58:08 -0500 Subject: [PATCH] Restore port to the hostname. Fixes BUKKIT-2124 --- src/main/java/net/minecraft/server/NetLoginHandler.java | 2 +- src/main/java/net/minecraft/server/Packet2Handshake.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/NetLoginHandler.java b/src/main/java/net/minecraft/server/NetLoginHandler.java index 2532c7545..fc4c8c66c 100644 --- a/src/main/java/net/minecraft/server/NetLoginHandler.java +++ b/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))) { diff --git a/src/main/java/net/minecraft/server/Packet2Handshake.java b/src/main/java/net/minecraft/server/Packet2Handshake.java index 81ce9c0fe..435e7e0b5 100644 --- a/src/main/java/net/minecraft/server/Packet2Handshake.java +++ b/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() {}