Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Fixed PlayerManager ConcurrentModificationExceptions. Fixes BUKKIT-1972

Browse Source
This commit is contained in:
Wesley Wolfe 2012-08-04 22:12:16 -05:00
parent 9804665fec
commit 0e013fa4b0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/PlayerManager.java
View File

@ -4,12 +4,14 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Queue; // CraftBukkit
public class PlayerManager {
private final WorldServer world;
private final List managedPlayers = new ArrayList();
private final LongHashMap c = new LongHashMap();
private final List d = new ArrayList();
private final Queue d = new java.util.concurrent.ConcurrentLinkedQueue(); // CraftBukkit ArrayList -> ConcurrentLinkedQueue
private final int e;
private final int[][] f = new int[][] { { 1, 0}, { 0, 1}, { -1, 0}, { 0, -1}};
private boolean wasNotEmpty; // CraftBukkit
@ -36,9 +38,11 @@ public class PlayerManager {
PlayerInstance playerinstance = (PlayerInstance) iterator.next();
playerinstance.a();
iterator.remove(); // CraftBukkit - remove to insure we are the consumer
}
this.d.clear();
// this.d.clear(); // CraftBukkit - removals are already covered
if (this.managedPlayers.isEmpty()) {
if (!wasNotEmpty) return; // CraftBukkit - only do unload when we go from non-empty to empty
WorldProvider worldprovider = this.world.worldProvider;
@ -231,7 +235,7 @@ public class PlayerManager {
return playermanager.c;
}
static List c(PlayerManager playermanager) {
static Queue c(PlayerManager playermanager) { // CraftBukkit List -> Queue
return playermanager.d;
}
}