fix: return on null plot on big boom

- Fixes #4084

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

@@ -50,6 +50,7 @@ import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
 import com.plotsquared.bukkit.util.TranslationUpdateManager;
+import com.plotsquared.bukkit.util.UpdateUtility;
 import com.plotsquared.bukkit.util.task.BukkitTaskManager;
 import com.plotsquared.bukkit.util.task.PaperTimeConverter;
 import com.plotsquared.bukkit.util.task.SpigotTimeConverter;
@@ -302,11 +303,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         this.serverLocale = Locale.forLanguageTag(Settings.Enabled_Components.DEFAULT_LOCALE);
 
-        /* TODO Enable update checker before v7 is released to GA
         if (PremiumVerification.isPremium() && Settings.Enabled_Components.UPDATE_NOTIFICATIONS) {
             injector.getInstance(UpdateUtility.class).updateChecker();
         }
-         */
 
         if (PremiumVerification.isPremium()) {
             LOGGER.info("PlotSquared version licensed to Spigot user {}", getUserID());

Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java

@@ -28,7 +28,7 @@ import java.nio.file.Paths;
 import java.util.stream.Stream;
 
 /**
- * This is a helper class which replaces older syntax no longer supported by MiniMessage with replacements in messages_%.json.
+ * This is a helper class which replaces occurrences of 'suggest_command' with 'run_command' in messages_%.json.
  * MiniMessage changed the syntax between major releases. To warrant a smooth upgrade, we attempt to replace any occurrences
  * while loading PlotSquared.
  *
@@ -38,22 +38,14 @@ import java.util.stream.Stream;
 public class TranslationUpdateManager {
 
     public static void upgradeTranslationFile() throws IOException {
-        String suggestCommand = "suggest_command";
-        String suggestCommandReplacement = "run_command";
-        String minHeight = "minHeight";
-        String minheightReplacement = "minheight";
-        String maxHeight = "maxHeight";
-        String maxheightReplacement = "maxheight";
+        String searchText = "suggest_command";
+        String replacementText = "run_command";
 
         try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
             paths
                     .filter(Files::isRegularFile)
                     .filter(p -> p.getFileName().toString().matches("messages_[a-z]{2}\\.json"))
-                    .forEach(p -> {
-                        replaceInFile(p, suggestCommand, suggestCommandReplacement);
-                        replaceInFile(p, minHeight, minheightReplacement);
-                        replaceInFile(p, maxHeight, maxheightReplacement);
-                    });
+                    .forEach(p -> replaceInFile(p, searchText, replacementText));
         }
     }
 

Core/src/main/java/com/plotsquared/core/command/Auto.java

@@ -298,7 +298,7 @@ public class Auto extends SubCommand {
             PlotExpression costExp = plotarea.getPrices().get("claim");
             PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
             int size = sizeX * sizeZ;
-            double mergeCost = size <= 1 || mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
+            double mergeCost = size > 1 && mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
             double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
                     player.getPlotCount() :
                     player.getPlotCount(plotarea.getWorldName()));

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

@@ -657,9 +657,9 @@ public abstract class PlotArea implements ComponentLike {
             player.sendMessage(
                     TranslatableCaption.of("height.height_limit"),
                     TagResolver.builder()
-                            .tag("minheight", Tag.inserting(Component.text(minBuildHeight)))
+                            .tag("minHeight", Tag.inserting(Component.text(minBuildHeight)))
                             .tag(
-                                    "maxheight",
+                                    "maxHeight",
                                     Tag.inserting(Component.text(maxBuildHeight))
                             ).build()
             );

Core/src/main/resources/lang/messages_en.json

@@ -486,7 +486,7 @@
   "single.get_position": "<prefix><gold>Go to the first corner and use: <gray><command> to create position 1.</gold>",
   "single.delete_world_region": "<prefix><red>Stop the server and delete: <world>/region.</red>",
   "single.regeneration_complete": "<prefix><gold>Regeneration complete.</gold>",
-  "single.worldcreation_location": "<prefix><gold>World creation settings may be stored in multiple locations:</gold>\n<dark_gray> - </dark_gray><gray>bukkit.yml in your server's root folder.</gray>\n<dark_gray> - </dark_gray><gray>PlotSquared's worlds.yml</gray>\n<dark_gray> - </dark_gray><gray>Hyperverse's worlds.yml (or any world management plugin)</gray>\n<dark_gray> - </dark_gray><red>Stop the server and delete it from these locations.</red>",
+  "single.worldcreation_location": "<prefix><gold>World creation settings may be stored in multiple locations:</gold>\n<dark_gray> - </dark_gray><gray>bukkit.yml in your server's root folder.</gray>\n<dark_gray> - </dark_gray><gray>PlotSquared's settings.yml</gray>\n<dark_gray> - </dark_gray><gray>Hyperverse's worlds.yml (or any world management plugin)</gray>\n<dark_gray> - </dark_gray><red>Stop the server and delete it from these locations.</red>",
   "legacyconfig.legacy_config_found": "<prefix><green>A legacy configuration file was detected. Conversion will be attempted.</green>",
   "legacyconfig.legacy_config_backup": "<prefix><gold>A copy of worlds.yml has been saved in the file worlds.yml.old</gold>.",
   "legacyconfig.legacy_config_replaced": "<prefix><gray><value1> has been replaced with <value2></gray>",

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.