Merge pull request Sefiraat#160 from balugaq/master

fix
LobbyTech-MC · Nov 2, 2024 · 366593c · 366593c
2 parents 16ed09e + 01aaf39
commit 366593c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ytdd9527.networksexpansion</groupId>
     <artifactId>NetworksExpansion</artifactId>
-    <version>2.1-Alpha-3</version>
+    <version>2.1-Alpha-4</version>
 
     <distributionManagement>
         <repository>

diff --git a/src/main/java/io/github/sefiraat/networks/NetworkStorage.java b/src/main/java/io/github/sefiraat/networks/NetworkStorage.java
@@ -7,15 +7,16 @@
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 @UtilityClass
 public class NetworkStorage {
-    private static final Map<ChunkPosition, Set<Location>> ALL_NETWORK_OBJECTS_BY_CHUNK = new HashMap<>();
-    private static final Map<Location, NodeDefinition> ALL_NETWORK_OBJECTS = new HashMap<>();
+    private static final Map<ChunkPosition, Set<Location>> ALL_NETWORK_OBJECTS_BY_CHUNK = new ConcurrentHashMap<>();
+    private static final Map<Location, NodeDefinition> ALL_NETWORK_OBJECTS = new ConcurrentHashMap<>();
 
     public static void removeNode(Location location) {
         final NodeDefinition nodeDefinition = ALL_NETWORK_OBJECTS.remove(location);
@@ -57,8 +58,13 @@ public static void unregisterChunk(Chunk chunk) {
         if (locations == null) {
             return;
         }
-        for (Location location : locations) {
+        Iterator<Location> iterator = locations.iterator();
+        while (iterator.hasNext()) {
+            Location location = iterator.next();
             removeNode(location);
+            iterator.remove();
         }
+        ALL_NETWORK_OBJECTS_BY_CHUNK.remove(chunkPosition);
     }
+
 }