Upstream
/
FabledSkyBlock
mirror of https://github.com/songoda/FabledSkyBlock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Fix ConcurrentModificationException on PlayerData-Storage (#39)

This commit is contained in:
Christian Koop 2024-04-06 21:11:13 +02:00
parent 018e26c1b0
commit 4dffd7e2a8
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/craftaro/skyblock/bank/BankManager.java
View File

@ -5,6 +5,7 @@ import com.craftaro.core.hooks.economies.Economy;
import com.craftaro.skyblock.SkyBlock; import com.craftaro.skyblock.SkyBlock;
import com.craftaro.skyblock.config.FileManager; import com.craftaro.skyblock.config.FileManager;
import com.craftaro.skyblock.island.Island; import com.craftaro.skyblock.island.Island;
import com.craftaro.skyblock.playerdata.PlayerData;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -12,6 +13,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
public class BankManager { public class BankManager {
@ -71,8 +73,11 @@ public class BankManager {
} }
private void loadTransactions() { private void loadTransactions() {
for (UUID uid : SkyBlock.getInstance().getPlayerDataManager().getPlayerData().keySet()) { Map<UUID, PlayerData> playerDataStorage = SkyBlock.getInstance().getPlayerDataManager().getPlayerData();
this.log.put(uid, SkyBlock.getInstance().getPlayerDataManager().getPlayerData().get(uid).getTransactions()); synchronized (playerDataStorage) {
for (UUID uid : playerDataStorage.keySet()) {
this.log.put(uid, playerDataStorage.get(uid).getTransactions());
}
} }
} }

12
src/main/java/com/craftaro/skyblock/confirmation/ConfirmationTask.java
View File

@ -4,6 +4,9 @@ import com.craftaro.skyblock.playerdata.PlayerData;
import com.craftaro.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.util.Map;
import java.util.UUID;
public class ConfirmationTask extends BukkitRunnable { public class ConfirmationTask extends BukkitRunnable {
private final PlayerDataManager playerDataManager; private final PlayerDataManager playerDataManager;
@ -13,9 +16,12 @@ public class ConfirmationTask extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
for (PlayerData playerData : this.playerDataManager.getPlayerData().values()) { Map<UUID, PlayerData> playerDataStorage = this.playerDataManager.getPlayerData();
if (playerData.getConfirmationTime() > 0) { synchronized (playerDataStorage) {
playerData.setConfirmationTime(playerData.getConfirmationTime() - 1); for (PlayerData playerData : playerDataStorage.values()) {
if (playerData.getConfirmationTime() > 0) {
playerData.setConfirmationTime(playerData.getConfirmationTime() - 1);
}
} }
} }
} }

16
src/main/java/com/craftaro/skyblock/island/IslandManager.java
View File

@ -1189,14 +1189,16 @@ public class IslandManager {
Map<UUID, PlayerData> playerDataStorage = this.plugin.getPlayerDataManager().getPlayerData(); Map<UUID, PlayerData> playerDataStorage = this.plugin.getPlayerDataManager().getPlayerData();
Set<UUID> islandVisitors = new HashSet<>(); Set<UUID> islandVisitors = new HashSet<>();
for (UUID playerDataStorageList : playerDataStorage.keySet()) { synchronized (playerDataStorage) {
PlayerData playerData = playerDataStorage.get(playerDataStorageList); for (UUID playerDataStorageList : playerDataStorage.keySet()) {
UUID islandOwnerUUID = playerData.getIsland(); PlayerData playerData = playerDataStorage.get(playerDataStorageList);
UUID islandOwnerUUID = playerData.getIsland();
if (islandOwnerUUID != null && islandOwnerUUID.equals(island.getOwnerUUID())) { if (islandOwnerUUID != null && islandOwnerUUID.equals(island.getOwnerUUID())) {
if (playerData.getOwner() == null || !playerData.getOwner().equals(island.getOwnerUUID())) { if (playerData.getOwner() == null || !playerData.getOwner().equals(island.getOwnerUUID())) {
if (Bukkit.getServer().getPlayer(playerDataStorageList) != null) { if (Bukkit.getServer().getPlayer(playerDataStorageList) != null) {
islandVisitors.add(playerDataStorageList); islandVisitors.add(playerDataStorageList);
}
} }
} }
} }

12
src/main/java/com/craftaro/skyblock/visit/VisitTask.java
View File

@ -4,6 +4,9 @@ import com.craftaro.skyblock.playerdata.PlayerData;
import com.craftaro.skyblock.playerdata.PlayerDataManager; import com.craftaro.skyblock.playerdata.PlayerDataManager;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.util.Map;
import java.util.UUID;
public class VisitTask extends BukkitRunnable { public class VisitTask extends BukkitRunnable {
private final PlayerDataManager playerDataManager; private final PlayerDataManager playerDataManager;
@ -13,9 +16,12 @@ public class VisitTask extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
for (PlayerData playerData : this.playerDataManager.getPlayerData().values()) { Map<UUID, PlayerData> playerDataStorage = this.playerDataManager.getPlayerData();
if (playerData.getIsland() != null) { synchronized (playerDataStorage) {
playerData.setVisitTime(playerData.getVisitTime() + 1); for (PlayerData playerData : playerDataStorage.values()) {
if (playerData.getIsland() != null) {
playerData.setVisitTime(playerData.getVisitTime() + 1);
}
} }
} }
} }