Release 7.3.8

Signed-off-by: Alexander Brandes <mc.cache@web.de>

.github/workflows/build-pr.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
       - name: Setup Java
         uses: actions/setup-java@v4
         with:

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
       - name: Setup Java
         uses: actions/setup-java@v4
         with:

Bukkit/build.gradle.kts

@@ -113,5 +113,6 @@ tasks {
         opt.encoding("UTF-8")
         opt.keyWords()
         opt.addStringOption("-since", isRelease)
+        opt.noTimestamp()
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java

@@ -154,7 +154,7 @@ public class EntitySpawnListener implements Listener {
         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             event.setCancelled(true);
         }
-        if (type == EntityType.ENDER_CRYSTAL) {
+        if (type == EntityType.ENDER_CRYSTAL || type == EntityType.ARMOR_STAND) {
             if (BukkitEntityUtil.checkEntity(entity, plot)) {
                 event.setCancelled(true);
             }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -1936,7 +1936,9 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler
     public void onPlayerTakeLecternBook(PlayerTakeLecternBookEvent event) {
-        Location location = BukkitUtil.adapt(event.getPlayer().getLocation());
+        Player player = event.getPlayer();
+        BukkitPlayer pp = BukkitUtil.adapt(player);
+        Location location = pp.getLocation();
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -1948,9 +1950,11 @@ public class PlayerEventListener implements Listener {
             }
             return;
         }
-        if (plot.getFlag(LecternReadBookFlag.class)) {
-            plot.debug(event.getPlayer().getName() + " could not take the book because of lectern-read-book = true");
-            event.setCancelled(true);
+        if (!plot.isAdded(pp.getUUID())) {
+            if (plot.getFlag(LecternReadBookFlag.class)) {
+                plot.debug(event.getPlayer().getName() + " could not take the book because of lectern-read-book = true");
+                event.setCancelled(true);
+            }
         }
     }
 

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

@@ -326,7 +326,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
             return;
         }
         this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()),
-                SoundCategory.MUSIC, 1f, 1f
+                SoundCategory.MUSIC, Float.MAX_VALUE, 1f
         );
     }
 

Core/build.gradle.kts

@@ -78,5 +78,6 @@ tasks {
         opt.encoding("UTF-8")
         opt.keyWords()
         opt.addStringOption("-since", isRelease)
+        opt.noTimestamp()
     }
 }

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

@@ -2574,7 +2574,7 @@ public class Plot {
      */
     public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
         Plot plot = this.getBasePlot(false);
-        if (!WorldUtil.isValidLocation(plot.getBottomAbs())) {
+        if ((getArea() == null || !(getArea() instanceof SinglePlotArea)) && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
             // prevent from teleporting into unsafe regions
             player.sendMessage(TranslatableCaption.of("border.denied"));
             resultConsumer.accept(false);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TileDropFlag.java

@@ -23,7 +23,7 @@ import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
- * @since TODO
+ * @since 7.3.7
  */
 
 public class TileDropFlag extends BooleanFlag<TileDropFlag> {

Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java

@@ -37,7 +37,7 @@ import java.util.List;
 
 public class SinglePlotManager extends PlotManager {
 
-    private static final int MAX_COORDINATE = 30000000;
+    private static final int MAX_COORDINATE = 20000000;
 
     public SinglePlotManager(final @NonNull PlotArea plotArea) {
         super(plotArea);

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -27,6 +27,8 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.LocaleHolder;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.player.MetaDataAccess;
+import com.plotsquared.core.player.PlayerMetaDataKeys;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.flag.GlobalFlagContainer;
@@ -197,6 +199,11 @@ public final class PlaceholderRegistry {
         });
         this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
         this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
+        this.createPlaceholder("total_grants", player -> {
+            try (final MetaDataAccess<Integer> metaDataAccess = player.accessPersistentMetaData(PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
+                return Integer.toString(metaDataAccess.get().orElse(0));
+            }
+        });
     }
 
     /**

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.3.7-SNAPSHOT"
+version = "7.3.8"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -118,7 +118,7 @@ subprojects {
     }
 
     signing {
-        if (!version.toString().endsWith("-SNAPSHOT")) {
+        if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) {
             val signingKey: String? by project
             val signingPassword: String? by project
             useInMemoryPgpKeys(signingKey, signingPassword)
@@ -209,6 +209,11 @@ subprojects {
         test {
             useJUnitPlatform()
         }
+
+        withType<AbstractArchiveTask>().configureEach {
+            isPreserveFileTimestamps = false
+            isReproducibleFileOrder = true
+        }
     }
 }
 

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 # Platform expectations
 paper = "1.20.2-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.8.3"
+spotbugs = "4.8.4"
 checkerqual = "3.42.0"
 gson = "2.10"
 guava = "31.1-jre"
@@ -13,7 +13,7 @@ log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.9.1"
+fawe = "2.9.2"
 placeholderapi = "2.11.5"
 luckperms = "5.4"
 essentialsx = "2.20.1"
@@ -23,20 +23,20 @@ mvdwapi = "3.1.1"
 prtree = "2.0.1"
 aopalliance = "1.0"
 cloud-services = "1.8.4"
-arkitektonika = "2.1.2"
+arkitektonika = "2.1.3"
 squirrelid = "0.3.2"
-paster = "1.1.5"
+paster = "1.1.6"
 bstats = "3.0.2"
 paperlib = "1.0.8"
-informative-annotations = "1.4"
+informative-annotations = "1.5"
 vault = "1.7.1"
-serverlib = "2.3.4"
+serverlib = "2.3.6"
 
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
 spotless = "6.25.0"
-nexus = "1.3.0"
+nexus = "2.0.0"
 runPaper = "2.2.3"
 
 [libraries]