Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch

@@ -1,4 +1,4 @@
-From 182aaa84bf197b9a61ec3a79033457788c4f1188 Mon Sep 17 00:00:00 2001
+From 4bf71722086d0436e249d4bd1db5fb205860a99f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
 Prevents server hanging if players disconnect during the shutdown sequence.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 07cee4d..1725bba 100644
+index fa3e65c..b6a3d2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1115,8 +1115,15 @@ public abstract class PlayerList {
+@@ -1125,8 +1125,15 @@ public abstract class PlayerList {
      }
  
      public void r() {
@@ -28,5 +28,5 @@ index 07cee4d..1725bba 100644
      }
  
 -- 
-1.8.3.2
+1.8.4.msysgit.0