build: Release 6.9.1

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

@@ -462,6 +462,7 @@ public final class FlagCommand extends Command {
             return;
         }
         final Plot plot = player.getLocation().getPlotAbs();
+        final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
         PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -506,7 +507,7 @@ public final class FlagCommand extends Command {
                     if (plot.removeFlag(flag)) {
                         player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
                                 "value",
-                                String.valueOf(flag)
+                                String.valueOf(flagWithOldValue)
                         ));
                         return;
                     } else {
@@ -544,7 +545,7 @@ public final class FlagCommand extends Command {
         }
         player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
                 "value",
-                String.valueOf(flag)
+                String.valueOf(flagWithOldValue)
         ));
     }
 

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -21,6 +21,7 @@ package com.plotsquared.core.generator;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.intellectualsites.annotations.DoNotUse;
+import com.intellectualsites.annotations.NotPublic;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.Settings;
@@ -480,7 +481,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /**
      * @deprecated This method should not be available for public API usage and will be made private.
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    @Deprecated(since = "6.9.1")
+    @NotPublic
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
             z += this.SIZE;
@@ -510,7 +512,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /**
      * @deprecated This method should not be available for public API usage and will be made private.
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    @Deprecated(since = "6.9.1")
+    @NotPublic
     public void addOverlayBiome(short x, short z, BiomeType id) {
         if (z < 0) {
             z += this.SIZE;

Core/src/main/java/com/plotsquared/core/location/Location.java

@@ -313,7 +313,7 @@ public sealed class Location extends BlockLoc implements Comparable<Location> pe
     /**
      * Get the absolute {@link Plot}, if any, that contains this location
      *
-     * @return (Absolute) plot containing the location, or {code null}
+     * @return (Absolute) plot containing the location, or {@code null}
      */
     public @Nullable Plot getPlotAbs() {
         final PlotArea area = this.getPlotArea();
@@ -327,7 +327,7 @@ public sealed class Location extends BlockLoc implements Comparable<Location> pe
     /**
      * Get the {@link Plot}, if any, that contains this location
      *
-     * @return plot containing the location, or {code null}
+     * @return plot containing the location, or {@code null}
      */
     public @Nullable Plot getPlot() {
         final PlotArea area = this.getPlotArea();

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

@@ -643,7 +643,7 @@ public abstract class PlotArea {
      * @param player Player to check
      * @param y      y height to check
      * @return true if outside build area with no permissions
-     * @since TODO
+     * @since 6.9.1
      */
     public boolean notifyIfOutsideBuildArea(PlotPlayer<?> player, int y) {
         if (!buildRangeContainsY(y) && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {

Core/src/main/java/com/plotsquared/core/util/Permissions.java

@@ -30,18 +30,9 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  * The Permissions class handles checking user permissions.<br>
  * - This will respect * nodes and plots.admin and can be used to check permission ranges (e.g. plots.plot.5)<br>
  * - Checking the PlotPlayer class directly will not take the above into account<br>
- *
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
- * classes
  */
-@Deprecated(forRemoval = true, since = "TODO")
 public class Permissions {
 
-    /**
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean hasPermission(PlotPlayer<?> player, Permission permission, boolean notify) {
         return hasPermission(player, permission.toString(), notify);
     }
@@ -52,25 +43,18 @@ public class Permissions {
      * @param caller     permission holder
      * @param permission Permission
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull Permission permission) {
         return caller.hasPermission(permission.toString());
     }
 
     /**
-     * Check if the owner of the profile has a given (global) permission. There is no guarantee that per-world permissions will
+     * Check if the owner of the profile has a given (global) permission
-     * be checked because unmaintained crap plugins like PEX exist.
      *
      * @param caller     permission holder
      * @param permission Permission
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull String permission) {
         return caller.hasPermission(permission);
     }
@@ -84,10 +68,7 @@ public class Permissions {
      * @param key        Permission "key"
      * @return {@code true} if the owner has the given permission, else {@code false}
      * @since 6.0.10
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean hasKeyedPermission(
             final @NonNull PermissionHolder caller, final @NonNull String permission,
             final @NonNull String key
@@ -102,10 +83,7 @@ public class Permissions {
      * @param permission permission
      * @param notify     if to notify the permission holder
      * @return if permission is had
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static boolean hasPermission(PlotPlayer<?> player, String permission, boolean notify) {
         if (!hasPermission(player, permission)) {
             if (notify) {
@@ -119,11 +97,6 @@ public class Permissions {
         return true;
     }
 
-    /**
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static int hasPermissionRange(PlotPlayer<?> player, Permission Permission, int range) {
         return hasPermissionRange(player, Permission.toString(), range);
     }
@@ -137,10 +110,7 @@ public class Permissions {
      * @param stub   The permission stub to check e.g. for `plots.plot.#` the stub is `plots.plot`
      * @param range  The range to check
      * @return The highest permission they have within that range
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public static int hasPermissionRange(PlotPlayer<?> player, String stub, int range) {
         return player.hasPermissionRange(stub, range);
     }

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.9.1-SNAPSHOT"
+version = "6.9.1"
 
 subprojects {
     group = rootProject.group