fix: skip valid location check for world plots

- Checking location on teleport to a single plot means the bukkit world is attempted to be accessed before it is loaded
 - we can just skip this check because we know the player will teleport to a reasonable location

.github/workflows/build-pr.yml

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

Bukkit/build.gradle.kts

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

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

@@ -24,6 +24,7 @@ import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Singleton;
 import com.google.inject.Stage;
+import com.google.inject.TypeLiteral;
 import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
 import com.plotsquared.bukkit.inject.BackupModule;
 import com.plotsquared.bukkit.inject.BukkitModule;
@@ -44,6 +45,7 @@ import com.plotsquared.bukkit.listener.SpigotListener;
 import com.plotsquared.bukkit.listener.WorldEvents;
 import com.plotsquared.bukkit.placeholder.PAPIPlaceholders;
 import com.plotsquared.bukkit.placeholder.PlaceholderFormatter;
+import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
@@ -1269,13 +1271,15 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
     @Override
     public @NonNull PlatformWorldManager<?> worldManager() {
-        return this.worldManager;
+        return injector().getInstance(Key.get(new TypeLiteral<PlatformWorldManager<World>>() {
+        }));
     }
 
     @Override
     @NonNull
+    @SuppressWarnings("unchecked")
     public PlayerManager<? extends PlotPlayer<Player>, ? extends Player> playerManager() {
-        return this.playerManager;
+        return (PlayerManager<BukkitPlayer, Player>) injector().getInstance(PlayerManager.class);
     }
 
     @Override

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 || type == EntityType.ARMOR_STAND) {
+        if (type == EntityType.ENDER_CRYSTAL) {
             if (BukkitEntityUtil.checkEntity(entity, plot)) {
                 event.setCancelled(true);
             }

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

@@ -1936,9 +1936,7 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler
     public void onPlayerTakeLecternBook(PlayerTakeLecternBookEvent event) {
-        Player player = event.getPlayer();
-        BukkitPlayer pp = BukkitUtil.adapt(player);
-        Location location = pp.getLocation();
+        Location location = BukkitUtil.adapt(event.getPlayer().getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -1950,12 +1948,10 @@ public class PlayerEventListener implements Listener {
             }
             return;
         }
-        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/listener/SingleWorldListener.java

@@ -95,8 +95,7 @@ public class SingleWorldListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onChunkLoad(ChunkLoadEvent event) {
-        // disable this for now, should address https://github.com/IntellectualSites/PlotSquared/issues/4413
-        // handle(event);
+        handle(event);
     }
 
 }

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, Float.MAX_VALUE, 1f
+                SoundCategory.MUSIC, 1f, 1f
         );
     }
 

Core/build.gradle.kts

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

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -106,10 +106,6 @@ public class PlotListener {
                             iterator.remove();
                             continue;
                         }
-                        // Don't attempt to heal dead players - they will get stuck in the abyss (#4406)
-                        if (PlotSquared.platform().worldUtil().getHealth(player) <= 0) {
-                            continue;
-                        }
                         double level = PlotSquared.platform().worldUtil().getHealth(player);
                         if (level != value.max) {
                             PlotSquared.platform().worldUtil().setHealth(player, Math.min(level + value.amount, value.max));

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 7.3.7
+ * @since TODO
  */
 
 public class TileDropFlag extends BooleanFlag<TileDropFlag> {

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

@@ -27,8 +27,6 @@ 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;
@@ -199,11 +197,6 @@ 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.9-SNAPSHOT"
+version = "7.3.7-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -118,7 +118,7 @@ subprojects {
     }
 
     signing {
-        if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) {
+        if (!version.toString().endsWith("-SNAPSHOT")) {
             val signingKey: String? by project
             val signingPassword: String? by project
             useInMemoryPgpKeys(signingKey, signingPassword)
@@ -209,11 +209,6 @@ subprojects {
         test {
             useJUnitPlatform()
         }
-
-        withType<AbstractArchiveTask>().configureEach {
-            isPreserveFileTimestamps = false
-            isReproducibleFileOrder = true
-        }
     }
 }
 

gradle/libs.versions.toml

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