Upstream merge + remove 3 pulled patches.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-12 10:17:46 +10:00
parent 70387ed9d8
commit 754e2b5680
28 changed files with 42 additions and 231 deletions

View File

@@ -1,4 +1,4 @@
From fb7a0b89a5948ad072b6b47c7cfbf24d58290fe2 Mon Sep 17 00:00:00 2001
From 0dc0c332b02bfa4d76bc029e89a6c59f28b13198 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 f0bc5c4..16df7ae 100644
index 20b9c5d..a85157b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1063,7 +1063,14 @@ public abstract class PlayerList {
@@ -1064,7 +1064,14 @@ public abstract class PlayerList {
public void r() {
while (!this.players.isEmpty()) {