28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From da4a8f81583a30ec10fb3091809c250a82a0ce36 Mon Sep 17 00:00:00 2001
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
Date: Tue, 29 Mar 2016 20:19:20 -0400
|
|
Subject: [PATCH] Fix some players not being kicked on shutdown
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 94f122d..d4de4e9 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -1292,9 +1292,11 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
public void u() {
|
|
- 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
|
|
+ // Paper start - Fix players being skipped due to concurrent list modification
|
|
+ for (EntityPlayer player : com.google.common.collect.ImmutableList.copyOf(this.players)) {
|
|
+ player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
|
|
}
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
--
|
|
2.8.0
|
|
|