diff options
author | EvilSeph <evilseph@unaligned.org> | 2011-04-29 03:14:16 -0400 |
---|---|---|
committer | EvilSeph <evilseph@unaligned.org> | 2011-04-29 03:14:16 -0400 |
commit | 955a78b8fd80337698f6bad9006952408c1ab451 (patch) | |
tree | 4d95640b6da9f4b5029a2cbd598b75896075bb4a /src/main/java/net/minecraft | |
parent | 9d7a03a64abeb878f265e380af4034e0892959b2 (diff) | |
download | craftbukkit-955a78b8fd80337698f6bad9006952408c1ab451.tar craftbukkit-955a78b8fd80337698f6bad9006952408c1ab451.tar.gz craftbukkit-955a78b8fd80337698f6bad9006952408c1ab451.tar.lz craftbukkit-955a78b8fd80337698f6bad9006952408c1ab451.tar.xz craftbukkit-955a78b8fd80337698f6bad9006952408c1ab451.zip |
Handle NPE in ThreadLoginVerifier that occurs when trying to continue using a closed socket.
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r-- | src/main/java/net/minecraft/server/ThreadLoginVerifier.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java index 9bf70e04..b781583c 100644 --- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java +++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java @@ -36,6 +36,10 @@ class ThreadLoginVerifier extends Thread { bufferedreader.close(); if (s1.equals("YES")) { // CraftBukkit start + if (this.netLoginHandler.getSocket() == null) { + return; + } + PlayerPreLoginEvent event = new PlayerPreLoginEvent(this.loginPacket.name, this.netLoginHandler.getSocket().getInetAddress()); server.getPluginManager().callEvent(event); |