fix: don't allow teleport to denied plots

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

@@ -252,11 +252,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return Bukkit.getVersion();
     }
 
-    @Override
-    public @NonNull String serverBrand() {
-        return Bukkit.getName();
-    }
-
     @Override
     @SuppressWarnings("deprecation") // Paper deprecation
     public void onEnable() {

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

@@ -28,6 +28,7 @@ import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -41,11 +42,31 @@ import org.bukkit.event.block.BlockReceiveGameEvent;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 @SuppressWarnings("unused")
 public class BlockEventListener117 implements Listener {
 
+    private static final Set<Material> COPPER_OXIDIZING = Set.of(
+            Material.COPPER_BLOCK,
+            Material.EXPOSED_COPPER,
+            Material.WEATHERED_COPPER,
+            Material.OXIDIZED_COPPER,
+            Material.CUT_COPPER,
+            Material.EXPOSED_CUT_COPPER,
+            Material.WEATHERED_CUT_COPPER,
+            Material.OXIDIZED_CUT_COPPER,
+            Material.CUT_COPPER_STAIRS,
+            Material.EXPOSED_CUT_COPPER_STAIRS,
+            Material.WEATHERED_CUT_COPPER_STAIRS,
+            Material.OXIDIZED_CUT_COPPER_STAIRS,
+            Material.CUT_COPPER_SLAB,
+            Material.EXPOSED_CUT_COPPER_SLAB,
+            Material.WEATHERED_CUT_COPPER_SLAB,
+            Material.OXIDIZED_CUT_COPPER_SLAB
+    );
+
     @Inject
     public BlockEventListener117() {
     }
@@ -163,7 +184,7 @@ public class BlockEventListener117 implements Listener {
         if (plot == null) {
             return;
         }
-        if (event.getNewState().getType().name().contains("COPPER")) {
+        if (COPPER_OXIDIZING.contains(event.getNewState().getType())) {
             if (!plot.getFlag(CopperOxideFlag.class)) {
                 plot.debug("Copper could not oxide because copper-oxide = false");
                 event.setCancelled(true);

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

@@ -88,8 +88,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Boat;
@@ -1372,7 +1374,22 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        final Block block = event.getBlock();
+        BlockFace bf = event.getBlockFace();
+        // Note: a month after Bukkit 1.14.4 released, they added the API method
+        // PlayerBucketEmptyEvent#getBlock(), which returns the block the
+        // bucket contents is going to be placed at. Currently we determine this
+        // block ourselves to retain compatibility with 1.13.
+        final Block block;
+        // if the block can be waterlogged, the event might waterlog the block
+        // sometimes
+        if (event.getBlockClicked().getBlockData() instanceof Waterlogged waterlogged
+                && !waterlogged.isWaterlogged() && event.getBucket() != Material.LAVA_BUCKET) {
+            block = event.getBlockClicked();
+        } else {
+            block = event.getBlockClicked().getLocation()
+                    .add(bf.getModX(), bf.getModY(), bf.getModZ())
+                    .getBlock();
+        }
         Location location = BukkitUtil.adapt(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -120,14 +120,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     @NonNull String serverImplementation();
 
-    /**
-     * Gets the server brand name
-     *
-     * @return server brand
-     * @since 7.5.3
-     */
-    @NonNull String serverBrand();
-
     /**
      * Gets the native server code package prefix.
      *

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

@@ -144,7 +144,6 @@ public class Buy extends Command {
             plot.getPlotModificationManager().setSign(player.getName());
             player.sendMessage(
                     TranslatableCaption.of("working.claimed"),
-                    TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
                     TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
             );
             this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);

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

@@ -131,7 +131,6 @@ public class Clear extends Command {
                     player.sendMessage(
                             TranslatableCaption.of("working.clearing_done"),
                             TagResolver.builder()
-                                    .tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
                                     .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                     .build()

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

@@ -86,8 +86,7 @@ public class DebugPaste extends SubCommand {
                 b.append("# WorldEdit implementation:\n");
                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n");
                 b.append("# Server Information\n");
-                b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ")
-                        .append(PlotSquared.platform().serverImplementation()).append("\n")
+                b.append("Server Version: ").append(PlotSquared.platform().serverImplementation())
                         .append("\n");
                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';')
                         .append(!Settings.UUID.OFFLINE).append('\n');

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

@@ -124,7 +124,6 @@ public class Delete extends SubCommand {
                                 "amount",
                                 Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
                         ),
-                        TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
                         TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
                 );
                 eventDispatcher.callPostDelete(plot);

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

@@ -1717,7 +1717,6 @@ public class Plot {
         }
         player.sendMessage(
                 TranslatableCaption.of("working.claimed"),
-                TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
                 TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
         );
         if (teleport) {

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

@@ -390,11 +390,11 @@
   "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>",
   "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
-  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
-  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
   "working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
   "working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
-  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
+  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
   "working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
   "working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
   "list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.3"
+version = "7.5.3-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""