Merge pull request #142 from TheNextLvl-net/thread-safety

Improved thread safety

Author: NonSwag

src/main/java/net/thenextlvl/tweaks/controller/BackController.java

@@ -7,52 +7,53 @@
 import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
-import java.util.WeakHashMap;
+import java.util.UUID;
 import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingDeque;
 
 @NullMarked
 public class BackController {
-    private final Map<Player, BlockingDeque<Location>> positions = new WeakHashMap<>();
-    private final Map<Player, Location> positionLock = new WeakHashMap<>();
+    private final Map<UUID, BlockingDeque<Location>> positions = new ConcurrentHashMap<>();
+    private final Map<UUID, Location> positionLock = new ConcurrentHashMap<>();
     private final TweaksPlugin plugin;
 
     public BackController(TweaksPlugin plugin) {
         this.plugin = plugin;
     }
 
     public @Nullable Location peekFirst(Player player) {
-        var deque = positions.get(player);
+        var deque = positions.get(player.getUniqueId());
         if (deque == null) return null;
         deque.removeIf(location -> !location.isWorldLoaded());
         return deque.peekFirst();
     }
 
     public void offerFirst(Player player, Location location) {
-        positions.computeIfAbsent(player, ignored ->
-                new LinkedBlockingDeque<>(plugin.config().general.backBufferStackSize)
-        ).offerFirst(location);
+        positions.computeIfAbsent(player.getUniqueId(), ignored -> {
+            return new LinkedBlockingDeque<>(plugin.config().general.backBufferStackSize);
+        }).offerFirst(location);
     }
 
     public void remove(Player player, Location location) {
-        positions.computeIfPresent(player, (ignored, locations) ->
+        positions.computeIfPresent(player.getUniqueId(), (ignored, locations) ->
                 locations.remove(location) && locations.isEmpty() ? null : locations);
     }
 
     public void remove(Player player) {
-        positionLock.remove(player);
-        positions.remove(player);
+        positionLock.remove(player.getUniqueId());
+        positions.remove(player.getUniqueId());
     }
 
     public @Nullable Location getLock(Player player) {
-        return positionLock.get(player);
+        return positionLock.get(player.getUniqueId());
     }
 
     public void lock(Player player, Location location) {
-        positionLock.put(player, location);
+        positionLock.put(player.getUniqueId(), location);
     }
 
     public void unlock(Player player) {
-        positionLock.remove(player);
+        positionLock.remove(player.getUniqueId());
     }
 }

src/main/java/net/thenextlvl/tweaks/controller/TPAController.java

@@ -6,10 +6,11 @@
 import org.jspecify.annotations.NullMarked;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 @NullMarked
 public class TPAController {
-    private final Map<Player, Set<Request>> requests = new WeakHashMap<>();
+    private final Map<UUID, Set<Request>> requests = new ConcurrentHashMap<>();
     private final TweaksPlugin plugin;
 
     public TPAController(TweaksPlugin plugin) {
@@ -19,7 +20,7 @@ public TPAController(TweaksPlugin plugin) {
     public void removeRequests(Player player) {
         requests.values().forEach(requests -> requests.removeIf(request -> request.player().equals(player)));
         requests.values().removeIf(Collection::isEmpty);
-        requests.remove(player);
+        requests.remove(player.getUniqueId());
     }
 
     public Optional<Request> getRequest(Player player, Player target) {
@@ -29,13 +30,13 @@ public Optional<Request> getRequest(Player player, Player target) {
     }
 
     public List<Request> getRequests(Player player) {
-        var requests = this.requests.get(player);
+        var requests = this.requests.get(player.getUniqueId());
         if (requests == null) return List.of();
         return List.copyOf(requests);
     }
 
     public boolean addRequest(Player player, Player sender, RequestType type) {
-        var players = requests.computeIfAbsent(player, ignored -> new HashSet<>());
+        var players = requests.computeIfAbsent(player.getUniqueId(), ignored -> new HashSet<>());
         return players.stream().noneMatch(request -> request.player().equals(sender))
                && players.add(new Request(sender, type));
     }
@@ -49,10 +50,10 @@ public void expireRequest(Player player, Player sender, RequestType type) {
     }
 
     public boolean removeRequest(Player sender, Player player, RequestType type) {
-        var players = requests.get(sender);
+        var players = requests.get(sender.getUniqueId());
         var result = players != null && players.removeIf(request ->
                 request.player().equals(player) && request.type() == type);
-        if (players != null && players.isEmpty()) requests.remove(sender);
+        if (players != null && players.isEmpty()) requests.remove(sender.getUniqueId());
         return result;
     }
 

src/main/java/net/thenextlvl/tweaks/controller/TeleportController.java

@@ -9,12 +9,13 @@
 import org.jspecify.annotations.NullMarked;
 
 import java.util.Map;
-import java.util.WeakHashMap;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 
 @NullMarked
 public class TeleportController {
-    private final Map<Player, Location> teleports = new WeakHashMap<>();
+    private final Map<UUID, Location> teleports = new ConcurrentHashMap<>();
     private final TweaksPlugin plugin;
 
     public TeleportController(TweaksPlugin plugin) {
@@ -25,7 +26,7 @@ public CompletableFuture<Boolean> teleport(Player player, Location location, Pla
         var cooldown = plugin.config().teleport.cooldown;
         if (cooldown <= 0 || player.hasPermission("tweaks.teleport.cooldown.bypass"))
             return player.teleportAsync(location, cause);
-        if (location.equals(teleports.put(player, location)))
+        if (location.equals(teleports.put(player.getUniqueId(), location)))
             return CompletableFuture.failedFuture(new IllegalStateException());
         plugin.bundle().sendMessage(player, plugin.config().teleport.allowMovement
                         ? "command.teleport.cooldown"
@@ -47,15 +48,15 @@ private CompletableFuture<Boolean> scheduleTeleport(Player player, Location loca
                     if (blockMovements && !player.getWorld().equals(previous.getWorld())) return false;
                     if (blockMovements && player.getLocation().distanceSquared(previous) > .2) return false;
                     Preconditions.checkState(player.isConnected());
-                    Preconditions.checkState(location.equals(teleports.getOrDefault(player, location)));
+                    Preconditions.checkState(location.equals(teleports.getOrDefault(player.getUniqueId(), location)));
                     Thread.sleep(Math.min(50, teleportTime - System.currentTimeMillis()));
                 }
 
                 return true;
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             } finally {
-                teleports.remove(player);
+                teleports.remove(player.getUniqueId());
             }
         }).thenCompose(success -> {
             if (success) return player.teleportAsync(location, cause);
@@ -64,6 +65,6 @@ private CompletableFuture<Boolean> scheduleTeleport(Player player, Location loca
     }
 
     public void remove(Player player) {
-        teleports.remove(player);
+        teleports.remove(player.getUniqueId());
     }
 }