Address review feedback

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java

@@ -67,14 +67,15 @@ public class BukkitPlayer extends PlotPlayer<Player> {
     private String name;
 
     /**
-     * <p>Please do not use this method. Instead use
-     * BukkitUtil.getPlayer(Player), as it caches player objects.</p>
-     *
      * @param plotAreaManager   PlotAreaManager instance
      * @param eventDispatcher   EventDispatcher instance
      * @param player            Bukkit player instance
      * @param permissionHandler PermissionHandler instance
+     *
+     * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
+     * This method will be made private in a future release.
      */
+    @Deprecated(forRemoval = true, since = "TODO")
     public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher,
             final @NonNull Player player, final @NonNull PermissionHandler permissionHandler
@@ -82,6 +83,16 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         this(plotAreaManager, eventDispatcher, player, false, permissionHandler);
     }
 
+    /**
+     * @param plotAreaManager   PlotAreaManager instance
+     * @param eventDispatcher   EventDispatcher instance
+     * @param player            Bukkit player instance
+     * @param permissionHandler PermissionHandler instance
+     *
+     * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
+     * This method will be made private in a future release.
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager, final @NonNull
             EventDispatcher eventDispatcher, final @NonNull Player player,

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java

@@ -54,6 +54,7 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
 
     @NonNull
     @Override
+    @SuppressWarnings("deprecation")
     public BukkitPlayer getPlayer(final @NonNull Player object) {
         if (object.getUniqueId().version() == 2) { // not a real player
             return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);
@@ -65,6 +66,7 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public @NonNull BukkitPlayer createPlayer(final @NonNull UUID uuid) {
         final Player player = Bukkit.getPlayer(uuid);
         if (player == null || !player.isOnline()) {

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -122,6 +122,9 @@ public class Plot {
     private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
     private static final Cleaner CLEANER = Cleaner.create();
 
+    static Set<Plot> connected_cache;
+    static Set<CuboidRegion> regions_cache;
+
     static {
         FLAG_DECIMAL_FORMAT.setMaximumFractionDigits(340);
     }
@@ -204,8 +207,6 @@ public class Plot {
      */
     private Plot origin;
 
-    private Set<Plot> connectedCache;
-
     /**
      * Constructor for a new plot.
      * (Only changes after plot.create() will be properly set in the database)
@@ -575,14 +576,7 @@ public class Plot {
             return false;
         }
         final Set<Plot> connected = getConnectedPlots();
-        for (Plot current : connected) {
-            // can skip ServerPlotFlag check in getOwner()
-            // as flags are synchronized between plots
-            if (uuid.equals(current.getOwnerAbs())) {
-                return true;
-            }
-        }
-        return false;
+        return connected.stream().anyMatch(current -> uuid.equals(current.getOwner()));
     }
 
     /**
@@ -1300,7 +1294,6 @@ public class Plot {
             DBFunc.delete(current);
             current.setOwnerAbs(null);
             current.settings = null;
-            current.clearCache();
             for (final PlotPlayer<?> pp : players) {
                 this.plotListener.plotEntry(pp, current);
             }
@@ -1871,7 +1864,6 @@ public class Plot {
         this.area.removePlot(this.id);
         this.id = plot.getId();
         this.area.addPlotAbs(this);
-        clearCache();
         DBFunc.movePlot(this, plot);
         TaskManager.runTaskLater(whenDone, TaskTime.ticks(1L));
         return true;
@@ -2136,16 +2128,17 @@ public class Plot {
                     this.origin.origin = base;
                     other.origin = base;
                     this.origin = base;
-                    this.connectedCache = null;
+                    connected_cache = null;
                 }
             } else {
                 if (this.origin != null) {
                     this.origin.origin = null;
                     this.origin = null;
                 }
-                this.connectedCache = null;
+                connected_cache = null;
             }
             DBFunc.setMerged(this, this.getSettings().getMerged());
+            regions_cache = null;
         }
     }
 
@@ -2180,7 +2173,8 @@ public class Plot {
     }
 
     public void clearCache() {
-        this.connectedCache = null;
+        connected_cache = null;
+        regions_cache = null;
         if (this.origin != null) {
             this.origin.origin = null;
             this.origin = null;
@@ -2307,9 +2301,10 @@ public class Plot {
         if (!this.isMerged()) {
             return Collections.singleton(this);
         }
-        if (this.connectedCache != null && this.connectedCache.contains(this)) {
-            return this.connectedCache;
+        if (connected_cache != null && connected_cache.contains(this)) {
+            return connected_cache;
         }
+        regions_cache = null;
 
         HashSet<Plot> tmpSet = new HashSet<>();
         tmpSet.add(this);
@@ -2414,7 +2409,7 @@ public class Plot {
                 }
             }
         }
-        this.connectedCache = tmpSet;
+        connected_cache = tmpSet;
         return tmpSet;
     }
 
@@ -2426,15 +2421,19 @@ public class Plot {
      * @return all regions within the plot
      */
     public @NonNull Set<CuboidRegion> getRegions() {
+        if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
+            return regions_cache;
+        }
         if (!this.isMerged()) {
             Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
             Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
-            this.connectedCache = Sets.newHashSet(this);
+            connected_cache = Sets.newHashSet(this);
             CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
-            return Collections.singleton(rg);
+            regions_cache = Collections.singleton(rg);
+            return regions_cache;
         }
         Set<Plot> plots = this.getConnectedPlots();
-        Set<CuboidRegion> regions = new HashSet<>();
+        Set<CuboidRegion> regions = regions_cache = new HashSet<>();
         Set<PlotId> visited = new HashSet<>();
         for (Plot current : plots) {
             if (visited.contains(current.getId())) {

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

@@ -263,7 +263,6 @@ public final class PlotModificationManager {
                     return;
                 }
                 Plot current = queue.poll();
-                current.clearCache();
                 if (plot.getArea().getTerrain() != PlotAreaTerrainType.NONE) {
                     try {
                         PlotSquared.platform().regionManager().regenerateRegion(
@@ -328,7 +327,6 @@ public final class PlotModificationManager {
         ArrayList<PlotId> ids = new ArrayList<>(plots.size());
         for (Plot current : plots) {
             current.setHome(null);
-            current.clearCache();
             ids.add(current.getId());
         }
         this.plot.clearRatings();
@@ -480,7 +478,8 @@ public final class PlotModificationManager {
                 this.plot.updateWorldBorder();
             }
         }
-        this.plot.clearCache();
+        Plot.connected_cache = null;
+        Plot.regions_cache = null;
         this.plot.getTrusted().clear();
         this.plot.getMembers().clear();
         this.plot.getDenied().clear();
@@ -631,7 +630,6 @@ public final class PlotModificationManager {
         if (queue.size() > 0) {
             queue.enqueue();
         }
-        visited.forEach(Plot::clearCache);
         return toReturn;
     }
 

Core/src/main/java/com/plotsquared/core/util/query/GlobalPlotProvider.java

@@ -23,9 +23,9 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 class GlobalPlotProvider implements PlotProvider {
 
@@ -37,7 +37,7 @@ class GlobalPlotProvider implements PlotProvider {
 
     @Override
     public Collection<Plot> getPlots() {
-        final List<Plot> plots = new ArrayList<>();
+        final Set<Plot> plots = new HashSet<>();
         for (final PlotArea plotArea : this.plotAreaManager.getAllPlotAreas()) {
             plots.addAll(plotArea.getPlots());
         }