2013-06-11 04:06:05 +00:00
|
|
|
From 2e8928d31ad16a25a3d171169281954e5357c38f Mon Sep 17 00:00:00 2001
|
2013-06-11 01:54:45 +00:00
|
|
|
From: md_5 <md_5@live.com.au>
|
|
|
|
|
Date: Tue, 11 Jun 2013 11:54:32 +1000
|
|
|
|
|
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 d5387f3..e5d2710 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
|
@@ -1071,7 +1071,14 @@ public abstract class PlayerList {
|
|
|
|
|
|
|
|
|
|
public void r() {
|
|
|
|
|
while (!this.players.isEmpty()) {
|
|
|
|
|
- ((EntityPlayer) this.players.get(0)).playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
|
|
|
|
|
+ // Spigot start
|
|
|
|
|
+ EntityPlayer p = (EntityPlayer) this.players.get( 0 );
|
|
|
|
|
+ p.playerConnection.disconnect( this.server.server.getShutdownMessage() );
|
|
|
|
|
+ if ( ( !this.players.isEmpty() ) && ( this.players.get( 0 ) == p ) )
|
|
|
|
|
+ {
|
|
|
|
|
+ this.players.remove( 0 ); // Prevent shutdown hang if already disconnected
|
|
|
|
|
+ }
|
|
|
|
|
+ // Spigot end
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
1.8.1.2
|
|
|
|
|
|
