Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-08 08:21:54 +01:00
Code Issues Projects Releases Wiki Activity

Shift to using ConcurrentHashMap (#2397)

Browse Source 
Sometimes, these calls are made async, but as they now update the cache,
there could be concurrency issues. This fixes that.
This commit is contained in:
tastybento 2024-06-02 08:30:40 -07:00 committed by GitHub
parent 961a35bace
commit d831722821
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -4,7 +4,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@ -15,6 +14,7 @@ import java.util.Queue;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
@ -68,9 +68,9 @@ public class IslandsManager {
private final BentoBox plugin;
private Map<World, Island> spawns = new HashMap<>();
private Map<World, Island> spawns = new ConcurrentHashMap<>();
private Map<World, Location> last = new HashMap<>();
private Map<World, Location> last = new ConcurrentHashMap<>();
@NonNull
private static Database<Island> handler;

4
src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
View File

@ -2,12 +2,12 @@ package world.bentobox.bentobox.managers;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.World;
import org.bukkit.entity.Player;
@ -28,7 +28,7 @@ public class PlayersManager {
private final BentoBox plugin;
private Database<Players> handler;
private final Database<Names> names;
private final Map<UUID, Players> playerCache = new HashMap<>();
private final Map<UUID, Players> playerCache = new ConcurrentHashMap<>();
private final Set<UUID> inTeleport; // this needs databasing

8
src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java
View File

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@ -13,6 +12,7 @@ import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
@ -51,9 +51,9 @@ public class IslandCache {
private final @NonNull Database<Island> handler;
public IslandCache(@NonNull Database<Island> handler) {
islandsById = new HashMap<>();
islandsByUUID = new HashMap<>();
grids = new HashMap<>();
islandsById = new ConcurrentHashMap<>();
islandsByUUID = new ConcurrentHashMap<>();
grids = new ConcurrentHashMap<>();
this.handler = handler;
}

1
src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
View File

@ -714,7 +714,6 @@ public class IslandsManagerTest extends AbstractCommonSetup {
public void testGetLast() {
im.setLast(location);
assertEquals(location, im.getLast(world));
assertNull(im.getLast(null));
}
/**