mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-18 11:22:15 +01:00
Fix some players not being kicked on shutdown
Closes GH-8
This commit is contained in:
parent
4588a80cdc
commit
1f9d65d57c
2 changed files with 26 additions and 1 deletions
Spigot-Server-Patches
|
@ -0,0 +1,25 @@
|
|||
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -0,0 +0,0 @@ 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
|
||||
|
||||
}
|
||||
|
||||
--
|
|
@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -0,0 +0,0 @@
|
||||
package net.minecraft.server;
|
||||
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
+import com.google.common.base.Predicate; // Paper
|
||||
import com.google.common.collect.Lists;
|
||||
|
|
Loading…
Add table
Reference in a new issue