Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 10:15:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix ConcurrentModificationException for async ScoreBoard [SD-8398]

Browse Source
This commit is contained in:
Christian Koop 2021-07-29 17:22:29 +02:00
parent 7d8a5e9b32
commit cc99b9c856
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/songoda/skyblock/scoreboard/Driver.java
View File

@ -30,14 +30,14 @@ class Driver extends BukkitRunnable {
ConfigurationSection config = scoreboardLoad.getConfigurationSection(boardType.getConfigSection()); ConfigurationSection config = scoreboardLoad.getConfigurationSection(boardType.getConfigSection());
if(config != null) { if (config != null) {
List<String> lines = config.getStringList("Title.Content"); List<String> lines = config.getStringList("Title.Content");
int interval = config.getInt("Title.Interval"); int interval = config.getInt("Title.Interval");
title = new Row(lines, interval); title = new Row(lines, interval);
for(int i = 1; i<16; i++) { for (int i = 1; i < 16; i++) {
List<String> rowLines = config.getStringList("Rows." + i + ".Content"); List<String> rowLines = config.getStringList("Rows." + i + ".Content");
if(!rowLines.isEmpty()) { if (!rowLines.isEmpty()) {
Row row = new Row(rowLines, config.getInt("Rows." + i + ".Interval")); Row row = new Row(rowLines, config.getInt("Rows." + i + ".Interval"));
rows.add(row); rows.add(row);
} }
@ -56,33 +56,41 @@ class Driver extends BukkitRunnable {
} }
void registerHolder(Holder holder) { void registerHolder(Holder holder) {
holders.add(holder); synchronized (this.holders) {
this.holders.add(holder);
}
} }
void unregisterHolder(Holder holder) { void unregisterHolder(Holder holder) {
holders.remove(holder); synchronized (this.holders) {
this.holders.remove(holder);
}
} }
void unregisterHolder(Player player) { void unregisterHolder(Player player) {
Iterator<Holder> it = holders.iterator(); synchronized (this.holders) {
while(it.hasNext()) { Iterator<Holder> it = this.holders.iterator();
Holder holder = it.next(); while (it.hasNext()) {
if(holder.getPlayer().equals(player)) { Holder holder = it.next();
it.remove(); if (holder.getPlayer().equals(player)) {
break; it.remove();
break;
}
} }
} }
} }
@Override @Override
public void run() { public void run() {
title.update(); title.update();
for(Row row : rows) { for (Row row : rows) {
row.update(); row.update();
} }
for(Holder holder : holders) { synchronized (this.holders) {
holder.update(); for (Holder holder : holders) {
holder.update();
}
} }
} }