From 4f70801d7449858686bdfd5628f871ab08c0e2bf Mon Sep 17 00:00:00 2001 From: md_5 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 5b0590e..1fb24f7 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1110,8 +1110,15 @@ public abstract class PlayerList { } public void r() { - for (int i = 0; i < this.players.size(); ++i) { - ((EntityPlayer) this.players.get(i)).playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message + while (!this.players.isEmpty()) { + // 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.5.2.msysgit.0