Address review feedback

.github/workflows/build-pr.yml

@@ -1,23 +0,0 @@
-name: Build PR
-
-on: [ pull_request ]
-
-jobs:
-  build_pr:
-    if: github.repository_owner == 'IntellectualSites'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-      - name: Clean Build
-        run: ./gradlew clean build

.github/workflows/build.yml

@@ -1,18 +1,15 @@
 name: build
 
-on:
+on: [ pull_request, push ]
-  push:
-    branches:
-      - v6
 
 jobs:
   build:
-    if: github.repository_owner == 'IntellectualSites'
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Validate Gradle Wrapper
+      - name: Validate Gradle Wrapper"
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v3

.github/workflows/codeql.yml

@@ -1,6 +1,8 @@
 name: "CodeQL"
 
 on:
+  push:
+    branches: [ v6 ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ v6 ]

Bukkit/build.gradle.kts

@@ -98,7 +98,6 @@ tasks.named<ShadowJar>("shadowJar") {
 
 tasks {
     withType<Javadoc> {
-        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://jd.papermc.io/paper/1.18/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
@@ -106,11 +105,6 @@ tasks {
         opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
-        opt.isLinkSource = true
-        opt.bottom(File("$rootDir/javadocfooter.html").readText())
-        opt.isUse = true
         opt.encoding("UTF-8")
-        opt.keyWords()
-        opt.addStringOption("-since", isRelease)
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -36,6 +36,7 @@ import com.plotsquared.bukkit.listener.ChunkListener;
 import com.plotsquared.bukkit.listener.EntityEventListener;
 import com.plotsquared.bukkit.listener.EntitySpawnListener;
 import com.plotsquared.bukkit.listener.PaperListener;
+import com.plotsquared.bukkit.listener.PaperListener113;
 import com.plotsquared.bukkit.listener.PlayerEventListener;
 import com.plotsquared.bukkit.listener.ProjectileEventListener;
 import com.plotsquared.bukkit.listener.ServerListener;
@@ -355,7 +356,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
             getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this);
             getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this);
             if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
+                if (serverVersion()[1] == 13) {
+                    getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener113.class), this);
+                } else {
                     getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
+                }
             } else {
                 getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
             }

Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java

@@ -30,9 +30,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  *
  * @deprecated Deprecated and scheduled for removal without replacement
  *         in favor of the build in setup wizard.
- *         However, this class will be kept around for a while, given it's not a maintenance burden.
  */
-@Deprecated
+@Deprecated(forRemoval = true, since = "6.0.0")
 @Singleton
 public class MultiverseWorldManager extends BukkitWorldManager {
 

Core/build.gradle.kts

@@ -65,18 +65,12 @@ tasks.processResources {
 
 tasks {
     withType<Javadoc> {
-        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
         opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
-        opt.isLinkSource = true
-        opt.bottom(File("$rootDir/javadocfooter.html").readText())
-        opt.isUse = true
         opt.encoding("UTF-8")
-        opt.keyWords()
-        opt.addStringOption("-since", isRelease)
     }
 }

Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java

@@ -114,7 +114,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     }
 
     /**
-     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)}
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)} )}
      */
     @Deprecated(forRemoval = true, since = "6.1.0")
     public void setSize_x(int sizeX) {
@@ -130,7 +130,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     }
 
     /**
-     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)}
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)} )}
      */
     @Deprecated(forRemoval = true, since = "6.1.0")
     public void setSize_z(int sizeZ) {

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) {
+        return connected.stream().anyMatch(current -> uuid.equals(current.getOwner()));
-            // can skip ServerPlotFlag check in getOwner()
-            // as flags are synchronized between plots
-            if (uuid.equals(current.getOwnerAbs())) {
-                return true;
-            }
-        }
-        return false;
     }
 
     /**
@@ -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)) {
+        if (connected_cache != null && connected_cache.contains(this)) {
-            return this.connectedCache;
+            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());
         }

build.gradle.kts

@@ -64,12 +64,12 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.22"))
+        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.21"))
     }
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
     }
 
     plugins.withId("java") {

javadocfooter.html

@@ -1,4 +0,0 @@
-Javadocs generated for
-<a rel="noopener nofollow noreferrer" href="https://github.com/IntellectualSites/PlotSquared/" target="_blank"> PlotSquared</a> |
-<a rel="noopener nofollow noreferrer" href="https://intellectualsites.github.io/plotsquared-documentation/"> Documentation </a> |
-Visit us on our <a rel="noopener nofollow noreferrer" href="https://discord.gg/intellectualsites"> Discord server</a> :)