Merge branch 'development'

This reverts commit 018e26c1b0.

Apparently 7.3 now requires java language features newer than Java 8... We can't upgrade right now

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.craftaro</groupId>
     <artifactId>FabledSkyBlock</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
 
     <name>FabledSkyBlock</name>
     <description>Bring your server's SkyBlock experience to the next level with the ability to fine-tune island settings, create custom islands, view leaderboards, and much more</description>

src/main/java/com/craftaro/skyblock/bank/BankManager.java

@@ -5,6 +5,7 @@ import com.craftaro.core.hooks.economies.Economy;
 import com.craftaro.skyblock.SkyBlock;
 import com.craftaro.skyblock.config.FileManager;
 import com.craftaro.skyblock.island.Island;
+import com.craftaro.skyblock.playerdata.PlayerData;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 
@@ -12,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 public class BankManager {
@@ -71,8 +73,11 @@ public class BankManager {
     }
 
     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());
+            }
         }
     }
 

src/main/java/com/craftaro/skyblock/confirmation/ConfirmationTask.java

@@ -4,6 +4,9 @@ import com.craftaro.skyblock.playerdata.PlayerData;
 import com.craftaro.skyblock.playerdata.PlayerDataManager;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.Map;
+import java.util.UUID;
+
 public class ConfirmationTask extends BukkitRunnable {
     private final PlayerDataManager playerDataManager;
 
@@ -13,9 +16,12 @@ public class ConfirmationTask extends BukkitRunnable {
 
     @Override
     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);
+                }
             }
         }
     }

src/main/java/com/craftaro/skyblock/island/IslandManager.java

@@ -1189,14 +1189,16 @@ public class IslandManager {
         Map<UUID, PlayerData> playerDataStorage = this.plugin.getPlayerDataManager().getPlayerData();
         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);
+                        }
                     }
                 }
             }

src/main/java/com/craftaro/skyblock/visit/VisitTask.java

@@ -4,6 +4,9 @@ import com.craftaro.skyblock.playerdata.PlayerData;
 import com.craftaro.skyblock.playerdata.PlayerDataManager;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.Map;
+import java.util.UUID;
+
 public class VisitTask extends BukkitRunnable {
     private final PlayerDataManager playerDataManager;
 
@@ -13,9 +16,12 @@ public class VisitTask extends BukkitRunnable {
 
     @Override
     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);
+                }
             }
         }
     }