chore/fix: use MUSIC sound category for plot music

* Add location not null check
The issue lies within the equals implementation

* Fix setposition method with default value.
Also add a comment too.

---------

Co-authored-by: OneLiteFeather <seelenretterin@onelitefeather.net>

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

@@ -40,6 +40,7 @@ import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import org.bukkit.GameMode;
 import org.bukkit.Sound;
+import org.bukkit.SoundCategory;
 import org.bukkit.WeatherType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -51,7 +52,6 @@ import org.bukkit.potion.PotionEffectType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
 
@@ -309,18 +309,21 @@ public class BukkitPlayer extends PlotPlayer<Player> {
     @Override
     public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
         if (id == ItemTypes.AIR) {
-            // Let's just stop all the discs because why not?
+            if (PlotSquared.platform().serverVersion()[1] >= 19) {
-            for (final Sound sound : Arrays.stream(Sound.values())
+                player.stopSound(SoundCategory.MUSIC);
-                    .filter(sound -> sound.name().contains("DISC")).toList()) {
+                return;
-                player.stopSound(sound);
             }
-            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
+            // 1.18 and downwards require a specific Sound to stop (even tho the packet does not??)
-        } else {
+            for (final Sound sound : Sound.values()) {
-            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
+                if (sound.name().startsWith("MUSIC_DISC")) {
-            this.player.playSound(BukkitUtil.adapt(location),
+                    this.player.stopSound(sound, SoundCategory.MUSIC);
-                    Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f
+                }
-            );
+            }
+            return;
         }
+        this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()),
+                SoundCategory.MUSIC, 1f, 1f
+        );
     }
 
     @SuppressWarnings("deprecation") // Needed for Spigot compatibility

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

@@ -55,6 +55,14 @@ public class TranslationUpdateManager {
         String userMove = "userMove";
         String userMoveReplacement = "user_move";
 
+        // tag opening / closing characters are important, as the locale keys exist as well, which should not be replaced
+        String listInfoUnknown = "<info.unknown>";
+        String listInfoUnknownReplacement = "<unknown>";
+        String listInfoServer = "<info.server>";
+        String listInfoServerReplacement = "<server>";
+        String listInfoEveryone = "<info.everyone>";
+        String listInfoEveryoneReplacement = "<everyone>";
+
         try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
             paths
                     .filter(Files::isRegularFile)
@@ -68,6 +76,9 @@ public class TranslationUpdateManager {
                         replaceInFile(p, minimumRadius, minimumRadiusReplacement);
                         replaceInFile(p, maximumMoves, maximumMovesReplacement);
                         replaceInFile(p, userMove, userMoveReplacement);
+                        replaceInFile(p, listInfoUnknown, listInfoUnknownReplacement);
+                        replaceInFile(p, listInfoServer, listInfoServerReplacement);
+                        replaceInFile(p, listInfoEveryone, listInfoEveryoneReplacement);
                     });
         }
     }

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

@@ -465,7 +465,7 @@ public class ListCmd extends SubCommand {
                 TextComponent.Builder builder = Component.text();
                 if (plot.getFlag(ServerPlotFlag.class)) {
                     TagResolver serverResolver = TagResolver.resolver(
-                            "info.server",
+                            "server",
                             Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
                     );
                     builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
@@ -483,13 +483,13 @@ public class ListCmd extends SubCommand {
                                 builder.append(MINI_MESSAGE.deserialize(online, resolver));
                             } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
                                 TagResolver unknownResolver = TagResolver.resolver(
-                                        "info.unknown",
+                                        "unknown",
                                         Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
                             } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
                                 TagResolver everyoneResolver = TagResolver.resolver(
-                                        "info.everyone",
+                                        "everyone",
                                         Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));

Core/src/main/java/com/plotsquared/core/database/SQLManager.java

@@ -2401,7 +2401,8 @@ public class SQLManager implements AbstractDB {
         addPlotTask(plot, new UniqueStatement("setPosition") {
             @Override
             public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, position == null ? "" : position);
+                // Please see the table creation statement. There is the default value of "default"
+                statement.setString(1, position == null ? "DEFAULT" : position);
                 statement.setInt(2, getId(plot));
             }
 

Core/src/main/java/com/plotsquared/core/permissions/Permission.java

@@ -59,6 +59,9 @@ public enum Permission implements ComponentLike {
     PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
     PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
     PERMISSION_ADMIN_PVE("plots.admin.pve"),
+    PERMISSION_ADMIN_PLACE_VEHICLE_ROAD("plots.admin.vehicle.place.road"),
+    PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED("plots.admin.vehicle.place.unowned"),
+    PERMISSION_ADMIN_PLACE_VEHICLE_OTHER("plots.admin.vehicle.place.other"),
     PERMISSION_ADMIN_PVP("plots.admin.pvp"),
     PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
     PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),

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

@@ -1483,7 +1483,7 @@ public class Plot {
      */
     public void setHome(BlockLoc location) {
         Plot plot = this.getBasePlot(false);
-        if (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location)) {
+        if (location != null && (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location))) {
             return;
         }
         plot.getSettings().setPosition(location);

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

@@ -382,14 +382,10 @@ public class EventDispatcher {
                             return true;
                         }
                     }
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
-                    );
                 }
                 final List<BlockTypeWrapper> use = plot.getFlag(UseFlag.class);
                 for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -398,7 +394,7 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) {
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
                     return true;
                 }
                 // we check for the EditSignFlag in the PlayerSignOpenEvent again, but we must not cancel the interact event
@@ -423,14 +419,10 @@ public class EventDispatcher {
                             return true;
                         }
                     }
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, false);
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), false
-                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, false);
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), false
-                    );
                 }
                 if (plot.getFlag(DeviceInteractFlag.class)) {
                     return true;
@@ -442,21 +434,14 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                return player.hasPermission(
+                return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false);
-                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
-                        false
-                );
             }
             case SPAWN_MOB -> {
                 if (plot == null) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
-                    );
                 }
                 if (plot.getFlag(MobPlaceFlag.class)) {
                     return true;
@@ -468,10 +453,7 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
-                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
-                        false
-                )) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -491,14 +473,10 @@ public class EventDispatcher {
             }
             case PLACE_MISC -> {
                 if (plot == null) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
-                    );
                 }
                 if (plot.getFlag(MiscPlaceFlag.class)) {
                     return true;
@@ -510,10 +488,7 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
-                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
-                        false
-                )) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -533,16 +508,28 @@ public class EventDispatcher {
             }
             case PLACE_VEHICLE -> {
                 if (plot == null) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_ROAD, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED, notifyPerms);
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
+                }
+                if (plot.getFlag(VehiclePlaceFlag.class)) {
+                    return true;
+                }
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_OTHER, false)) {
+                    return true;
+                }
+                if (notifyPerms) {
+                    player.sendMessage(
+                            TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
+                            TagResolver.resolver(
+                                    "flag",
+                                    Tag.inserting(
+                                            PlotFlag.getFlagNameComponent(VehiclePlaceFlag.class)
+                                    )
+                            )
                     );
                 }
-                return plot.getFlag(VehiclePlaceFlag.class);
             }
             default -> {
             }

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

@@ -381,9 +381,9 @@
   "info.plot_list_default": "<gold><plot></gold>",
   "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_aqua>Online</dark_aqua>'><gold><player></gold></hover>",
   "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_gray>Offline</dark_gray>'><gold><player></gold></hover>",
-  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><info.unknown></white></hover>",
+  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><unknown></white></hover>",
-  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><info.server></white></hover>",
+  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><server></white></hover>",
-  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><info.everyone></white></hover>",
+  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><everyone></white></hover>",
   "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
   "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.18"
-fawe = "2.8.3"
+fawe = "2.8.4"
 placeholderapi = "2.11.5"
 luckperms = "5.4"
 essentialsx = "2.20.1"