summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2012-08-08 06:58:08 -0500
committerWesley Wolfe <weswolf@aol.com>2012-08-08 07:00:29 -0500
commit25fe93479f6fdd20a1ea2c22605eed16a7be7075 (patch)
treef03faeedb3eed5a295049b5f010a359f1dccccba /src/main/java/net
parent24809ef98638138a31b79d7db6c2741611a539bc (diff)
downloadcraftbukkit-25fe93479f6fdd20a1ea2c22605eed16a7be7075.tar
craftbukkit-25fe93479f6fdd20a1ea2c22605eed16a7be7075.tar.gz
craftbukkit-25fe93479f6fdd20a1ea2c22605eed16a7be7075.tar.lz
craftbukkit-25fe93479f6fdd20a1ea2c22605eed16a7be7075.tar.xz
craftbukkit-25fe93479f6fdd20a1ea2c22605eed16a7be7075.zip
Restore port to the hostname. Fixes BUKKIT-2124
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/NetLoginHandler.java2
-rw-r--r--src/main/java/net/minecraft/server/Packet2Handshake.java2
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 2532c754..fc4c8c66 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 81ce9c0f..435e7e0b 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() {}