Make player-marker supplier check for late loaded worlds

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/live/LivePlayersDataSupplier.java

@@ -30,6 +30,8 @@
 import de.bluecolored.bluemap.common.serverinterface.Server;
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import de.bluecolored.bluemap.core.logger.Logger;
+import de.bluecolored.bluemap.core.world.World;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -41,10 +43,12 @@ public class LivePlayersDataSupplier implements Supplier<String> {
 
     private final Server server;
     private final PluginConfig config;
-    private final ServerWorld world;
+    private final World world;
     private final Predicate<UUID> playerFilter;
 
-    public LivePlayersDataSupplier(Server server, PluginConfig config, ServerWorld world, Predicate<UUID> playerFilter) {
+    private transient @Nullable ServerWorld serverWorld;
+
+    public LivePlayersDataSupplier(Server server, PluginConfig config, World world, Predicate<UUID> playerFilter) {
         this.server = server;
         this.config = config;
         this.world = world;
@@ -53,6 +57,9 @@ public LivePlayersDataSupplier(Server server, PluginConfig config, ServerWorld w
 
     @Override
     public String get() {
+        if (serverWorld == null)
+            serverWorld = server.getServerWorld(world).orElse(null);
+
         try (StringWriter jsonString = new StringWriter();
             JsonWriter json = new JsonWriter(jsonString)) {
 
@@ -61,7 +68,7 @@ public String get() {
 
             if (config.isLivePlayerMarkers()) {
                 for (Player player : this.server.getOnlinePlayers()) {
-                    boolean isCorrectWorld = player.getWorld().equals(this.world);
+                    boolean isCorrectWorld = player.getWorld().equals(serverWorld);
 
                     if (config.isHideInvisible() && player.isInvisible()) continue;
                     if (config.isHideVanished() && player.isVanished()) continue;

common/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

@@ -539,12 +539,10 @@ public void savePlayerStates() {
 
         var maps = blueMap.getMaps();
         for (BmMap map : maps.values()) {
-            var serverWorld = serverInterface.getServerWorld(map.getWorld()).orElse(null);
-            if (serverWorld == null) continue;
             var dataSupplier = new LivePlayersDataSupplier(
                     serverInterface,
                     getBlueMap().getConfig().getPluginConfig(),
-                    serverWorld,
+                    map.getWorld(),
                     Predicate.not(pluginState::isPlayerHidden)
             );
             try (

common/src/main/java/de/bluecolored/bluemap/common/serverinterface/Server.java

@@ -24,6 +24,9 @@
  */
 package de.bluecolored.bluemap.common.serverinterface;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import de.bluecolored.bluemap.common.debug.DebugDump;
 import de.bluecolored.bluemap.core.util.Tristate;
 import de.bluecolored.bluemap.core.world.World;
@@ -33,9 +36,16 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 public interface Server {
 
+    Cache<World, Optional<ServerWorld>> SERVER_WORLD_CACHE = Caffeine.newBuilder()
+            .expireAfterWrite(10, TimeUnit.SECONDS)
+            .weakKeys()
+            .weakValues()
+            .build();
+
     @DebugDump
     @Nullable String getMinecraftVersion();
 
@@ -63,17 +73,18 @@ default Tristate isMetricsEnabled() {
      * Returns the correct {@link ServerWorld} for a {@link World} if there is any.
      */
     default Optional<ServerWorld> getServerWorld(World world) {
-        if (world instanceof MCAWorld) {
-            MCAWorld mcaWorld = (MCAWorld) world;
-            return getLoadedServerWorlds().stream()
-                    .filter(serverWorld ->
-                            serverWorld.getWorldFolder().toAbsolutePath().normalize()
-                                    .equals(mcaWorld.getWorldFolder().toAbsolutePath().normalize()) &&
-                            serverWorld.getDimension().equals(mcaWorld.getDimension())
-                    )
-                    .findAny();
-        }
-        return Optional.empty();
+        return SERVER_WORLD_CACHE.get(world, w -> {
+            if (w instanceof MCAWorld mcaWorld) {
+                return getLoadedServerWorlds().stream()
+                        .filter(serverWorld ->
+                                serverWorld.getWorldFolder().toAbsolutePath().normalize()
+                                        .equals(mcaWorld.getWorldFolder().toAbsolutePath().normalize()) &&
+                                        serverWorld.getDimension().equals(mcaWorld.getDimension())
+                        )
+                        .findAny();
+            }
+            return Optional.empty();
+        });
     }
 
     /**

common/src/main/java/de/bluecolored/bluemap/common/web/MapRequestHandler.java

@@ -42,7 +42,7 @@ public class MapRequestHandler extends RoutingRequestHandler {
 
     public MapRequestHandler(BmMap map, Server serverInterface, PluginConfig pluginConfig, Predicate<UUID> playerFilter) {
         this(map.getStorage(),
-                createPlayersDataSupplier(map, serverInterface, pluginConfig, playerFilter),
+                new LivePlayersDataSupplier(serverInterface, pluginConfig, map.getWorld(), playerFilter),
                 new LiveMarkersDataSupplier(map.getMarkerSets()));
     }
 
@@ -69,10 +69,4 @@ public MapRequestHandler(MapStorage mapStorage,
         }
     }
 
-    private static @Nullable LivePlayersDataSupplier createPlayersDataSupplier(BmMap map, Server serverInterface, PluginConfig pluginConfig, Predicate<UUID> playerFilter) {
-        ServerWorld world = serverInterface.getServerWorld(map.getWorld()).orElse(null);
-        if (world == null) return null;
-        return new LivePlayersDataSupplier(serverInterface, pluginConfig, world, playerFilter);
-    }
-
 }