summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/NetworkAcceptThread.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetworkAcceptThread.java b/src/main/java/net/minecraft/server/NetworkAcceptThread.java
index 2937aee8..75985a3c 100644
--- a/src/main/java/net/minecraft/server/NetworkAcceptThread.java
+++ b/src/main/java/net/minecraft/server/NetworkAcceptThread.java
@@ -26,7 +26,13 @@ class NetworkAcceptThread extends Thread {
if (socket != null) {
synchronized (NetworkListenThread.getRecentConnectionAttempts(this.listenThread)) {
InetAddress inetaddress = socket.getInetAddress();
- connectionThrottle = this.a.server.getConnectionThrottle(); // CraftBukkit
+ // CraftBukkit start
+ if (this.a.server == null) {
+ socket.close();
+ continue;
+ }
+ connectionThrottle = this.a.server.getConnectionThrottle();
+ // CraftBukkit end
// CraftBukkit
if (NetworkListenThread.getRecentConnectionAttempts(this.listenThread).containsKey(inetaddress) && System.currentTimeMillis() - ((Long) NetworkListenThread.getRecentConnectionAttempts(this.listenThread).get(inetaddress)).longValue() < connectionThrottle) {