fix: Add user friendly message for creationdate placeholder

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,11 +27,10 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.19.2'
-        - '1.19.1'
         - '1.19'
         - '1.18.2'
         - '1.18.1'
+        - '1.18'
         - '1.17.1'
         - '1.16.5'
     validations:

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

@@ -41,7 +41,6 @@ import com.plotsquared.bukkit.listener.PlayerEventListener;
 import com.plotsquared.bukkit.listener.ProjectileEventListener;
 import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
-import com.plotsquared.bukkit.listener.SpigotListener;
 import com.plotsquared.bukkit.listener.WorldEvents;
 import com.plotsquared.bukkit.placeholder.PAPIPlaceholders;
 import com.plotsquared.bukkit.placeholder.PlaceholderFormatter;
@@ -361,8 +360,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                 } else {
                     getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
                 }
-            } else {
-                getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
             }
             this.plotListener.startRunnable();
         }
@@ -659,15 +656,20 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
             final @NonNull SQLiteUUIDService sqLiteUUIDService,
             final @NonNull CacheUUIDService cacheUUIDService
     ) {
-        // Record all unique UUID's and put them into a queue
-        final Set<UUID> uuidSet = new HashSet<>();
+        // Load all uuids into a big chunky boi queue
+        final Queue<UUID> uuidQueue = new LinkedBlockingQueue<>();
         PlotSquared.get().forEachPlotRaw(plot -> {
-            uuidSet.add(plot.getOwnerAbs());
-            uuidSet.addAll(plot.getMembers());
-            uuidSet.addAll(plot.getTrusted());
-            uuidSet.addAll(plot.getDenied());
+            final Set<UUID> uuids = new HashSet<>();
+            uuids.add(plot.getOwnerAbs());
+            uuids.addAll(plot.getMembers());
+            uuids.addAll(plot.getTrusted());
+            uuids.addAll(plot.getDenied());
+            for (final UUID uuid : uuids) {
+                if (!uuidQueue.contains(uuid)) {
+                    uuidQueue.add(uuid);
+                }
+            }
         });
-        final Queue<UUID> uuidQueue = new LinkedBlockingQueue<>(uuidSet);
 
         LOGGER.info("(UUID) {} UUIDs will be cached", uuidQueue.size());
 

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

@@ -109,8 +109,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @SuppressWarnings("unused")
 public class BlockEventListener implements Listener {
@@ -123,11 +121,6 @@ public class BlockEventListener implements Listener {
             Material.TURTLE_EGG,
             Material.TURTLE_SPAWN_EGG
     );
-    private static final Set<Material> SNOW = Stream.of(Material.values()) // needed as Tag.SNOW isn't present in 1.16.5
-            .filter(material -> material.name().contains("SNOW"))
-            .filter(Material::isBlock)
-            .collect(Collectors.toUnmodifiableSet());
-
     private final PlotAreaManager plotAreaManager;
     private final WorldEdit worldEdit;
 
@@ -442,7 +435,6 @@ public class BlockEventListener implements Listener {
             case "TWISTING_VINES":
             case "CAVE_VINES":
             case "VINE":
-            case "GLOW_BERRIES":
                 if (!plot.getFlag(VineGrowFlag.class)) {
                     plot.debug("Vine could not grow because vine-grow = false");
                     event.setCancelled(true);
@@ -537,7 +529,7 @@ public class BlockEventListener implements Listener {
             event.setCancelled(true);
             return;
         }
-        if (SNOW.contains(event.getNewState().getType())) {
+        if (Tag.SNOW.isTagged(event.getNewState().getType())) {
             if (!plot.getFlag(SnowFormFlag.class)) {
                 plot.debug("Snow could not form because snow-form = false");
                 event.setCancelled(true);
@@ -569,7 +561,7 @@ public class BlockEventListener implements Listener {
             return;
         }
         Class<? extends BooleanFlag<?>> flag;
-        if (SNOW.contains(event.getNewState().getType())) {
+        if (Tag.SNOW.isTagged(event.getNewState().getType())) {
             flag = SnowFormFlag.class;
         } else if (Tag.ICE.isTagged(event.getNewState().getType())) {
             flag = IceFormFlag.class;
@@ -686,7 +678,7 @@ public class BlockEventListener implements Listener {
             }
             return;
         }
-        if (SNOW.contains(blockType)) {
+        if (Tag.SNOW.isTagged(blockType)) {
             if (!plot.getFlag(SnowMeltFlag.class)) {
                 plot.debug("Snow could not melt because snow-melt = false");
                 event.setCancelled(true);
@@ -700,7 +692,7 @@ public class BlockEventListener implements Listener {
             }
             return;
         }
-        if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType) || Tag.WALL_CORALS.isTagged(blockType)) {
+        if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType)) {
             if (!plot.getFlag(CoralDryFlag.class)) {
                 plot.debug("Coral could not dry because coral-dry = false");
                 event.setCancelled(true);

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

@@ -126,16 +126,16 @@ public class EntitySpawnListener implements Listener {
         Plot plot = location.getOwnedPlotAbs();
         EntityType type = entity.getType();
         if (plot == null) {
-            if (type == EntityType.DROPPED_ITEM) {
-                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
             if (!area.isMobSpawning()) {
                 if (type == EntityType.PLAYER) {
                     return;
                 }
+                if (type == EntityType.DROPPED_ITEM) {
+                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
                 if (type.isAlive()) {
                     event.setCancelled(true);
                 }

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

@@ -18,6 +18,7 @@
  */
 package com.plotsquared.bukkit.listener;
 
+import com.google.common.collect.Iterables;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.location.Location;
@@ -38,11 +39,8 @@ public class ForceFieldListener {
 
     private static Set<PlotPlayer<?>> getNearbyPlayers(Player player, Plot plot) {
         Set<PlotPlayer<?>> players = new HashSet<>();
-        for (Player nearPlayer : player.getNearbyEntities(5d, 5d, 5d).stream()
-                .filter(entity -> entity instanceof Player)
-                .map(entity -> (Player) entity)
-                .toList()
-        ) {
+        for (Player nearPlayer : Iterables
+                .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
             PlotPlayer<?> plotPlayer;
             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot
                     .equals(plotPlayer.getCurrentPlot())) {
@@ -56,11 +54,8 @@ public class ForceFieldListener {
     }
 
     private static PlotPlayer<?> hasNearbyPermitted(Player player, Plot plot) {
-        for (Player nearPlayer : player.getNearbyEntities(5d, 5d, 5d).stream()
-                .filter(entity -> entity instanceof Player)
-                .map(entity -> (Player) entity)
-                .toList()
-        ) {
+        for (Player nearPlayer : Iterables
+                .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
             PlotPlayer<?> plotPlayer;
             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot
                     .equals(plotPlayer.getCurrentPlot())) {

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

@@ -18,7 +18,6 @@
  */
 package com.plotsquared.bukkit.listener;
 
-import com.destroystokyo.paper.event.block.BeaconEffectEvent;
 import com.destroystokyo.paper.event.entity.EntityPathfindEvent;
 import com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent;
 import com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent;
@@ -37,11 +36,8 @@ import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.flag.FlagContainer;
-import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import net.kyori.adventure.text.minimessage.Template;
@@ -233,17 +229,17 @@ public class PaperListener implements Listener {
         Plot plot = location.getOwnedPlotAbs();
         if (plot == null) {
             EntityType type = event.getType();
-            // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
-            if (type == EntityType.DROPPED_ITEM) {
-                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
             if (!area.isMobSpawning()) {
                 if (type == EntityType.PLAYER) {
                     return;
                 }
+                if (type == EntityType.DROPPED_ITEM) {
+                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                        event.setShouldAbortSpawn(true);
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
                 if (type.isAlive()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
@@ -404,50 +400,4 @@ public class PaperListener implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onBeaconEffect(final BeaconEffectEvent event) {
-        Block block = event.getBlock();
-        Location beaconLocation = BukkitUtil.adapt(block.getLocation());
-        Plot beaconPlot = beaconLocation.getPlot();
-
-        PlotArea area = beaconLocation.getPlotArea();
-        if (area == null) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        Location playerLocation = BukkitUtil.adapt(player.getLocation());
-
-        PlotPlayer<Player> plotPlayer = BukkitUtil.adapt(player);
-        Plot playerStandingPlot = playerLocation.getPlot();
-        if (playerStandingPlot == null) {
-            FlagContainer container = area.getRoadFlagContainer();
-            if (!getBooleanFlagValue(container, BeaconEffectsFlag.class, true) ||
-                    (beaconPlot != null && Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW)) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-
-        FlagContainer container = playerStandingPlot.getFlagContainer();
-        boolean plotBeaconEffects = getBooleanFlagValue(container, BeaconEffectsFlag.class, true);
-        if (playerStandingPlot.equals(beaconPlot)) {
-            if (!plotBeaconEffects) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-
-        if (!plotBeaconEffects || Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW) {
-            event.setCancelled(true);
-        }
-    }
-
-    private boolean getBooleanFlagValue(@NonNull FlagContainer container,
-                                        @NonNull Class<? extends BooleanFlag<?>> flagClass,
-                                        boolean defaultValue) {
-        BooleanFlag<?> flag = container.getFlag(flagClass);
-        return flag == null ? defaultValue : flag.getValue();
-    }
-
 }

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

@@ -106,7 +106,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.EntityPlaceEvent;
-import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
@@ -143,7 +142,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -206,29 +204,6 @@ public class PlayerEventListener implements Listener {
         this.plotListener = plotListener;
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onEffect(@NonNull EntityPotionEffectEvent event) {
-        if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
-                event.getCause() != EntityPotionEffectEvent.Cause.BEACON ||
-                !(event.getEntity() instanceof Player player)) {
-            return;
-        }
-
-        UUID uuid = player.getUniqueId();
-        PotionEffect effect = event.getNewEffect();
-        if (effect == null) {
-            PotionEffect oldEffect = event.getOldEffect();
-            if (oldEffect != null) {
-                String name = oldEffect.getType().getName();
-                plotListener.addEffect(uuid, name, -1);
-            }
-        } else {
-            long expiresAt = System.currentTimeMillis() + effect.getDuration() * 50L; //Convert ticks to milliseconds
-            String name = effect.getType().getName();
-            plotListener.addEffect(uuid, name, expiresAt);
-        }
-    }
-
     @EventHandler
     public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
         if (e.getVehicle().getType() == EntityType.BOAT) {

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

@@ -1,57 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.listener;
-
-import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.location.Location;
-import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.plot.flag.FlagContainer;
-import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityPotionEffectEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Fallback listener for paper events on spigot
- */
-public class SpigotListener implements Listener {
-
-    @EventHandler(ignoreCancelled = true)
-    public void onEffect(@NonNull EntityPotionEffectEvent event) {
-        if (event.getCause() != EntityPotionEffectEvent.Cause.BEACON) {
-            return;
-        }
-
-        Entity entity = event.getEntity();
-        Location location = BukkitUtil.adapt(entity.getLocation());
-        Plot plot = location.getPlot();
-        if (plot == null) {
-            return;
-        }
-
-        FlagContainer container = plot.getFlagContainer();
-        BeaconEffectsFlag effectsEnabled = container.getFlag(BeaconEffectsFlag.class);
-        if (effectsEnabled != null && !effectsEnabled.getValue()) {
-            event.setCancelled(true);
-        }
-    }
-
-}

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

@@ -47,13 +47,13 @@ import org.bukkit.event.EventException;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.RegisteredListener;
-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;
+import java.util.stream.Collectors;
 
 import static com.sk89q.worldedit.world.gamemode.GameModes.ADVENTURE;
 import static com.sk89q.worldedit.world.gamemode.GameModes.CREATIVE;
@@ -348,14 +348,6 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         return BukkitUtil.BUKKIT_AUDIENCES.player(this.player);
     }
 
-    @Override
-    public void removeEffect(@NonNull String name) {
-        PotionEffectType type = PotionEffectType.getByName(name);
-        if (type != null) {
-            player.removePotionEffect(type);
-        }
-    }
-
     @Override
     public boolean canSee(final PlotPlayer<?> other) {
         if (other instanceof ConsolePlayer) {

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

@@ -58,7 +58,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
 import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.type.WallSign;
-import org.bukkit.entity.Allay;
 import org.bukkit.entity.Ambient;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.AreaEffectCloud;
@@ -438,9 +437,6 @@ public class BukkitUtil extends WorldUtil {
                 allowedInterfaces.add(Animals.class);
                 allowedInterfaces.add(WaterMob.class);
                 allowedInterfaces.add(Ambient.class);
-                if (PlotSquared.platform().serverVersion()[1] >= 19) {
-                    allowedInterfaces.add(Allay.class);
-                }
             }
             case "tameable" -> allowedInterfaces.add(Tameable.class);
             case "vehicle" -> allowedInterfaces.add(Vehicle.class);

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

@@ -251,7 +251,6 @@ public class Auto extends SubCommand {
                     TranslatableCaption.of("permission.no_permission"),
                     Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
             );
-            return false;
         }
         if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
             player.sendMessage(

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

@@ -126,7 +126,6 @@ public class Buy extends Command {
                 plot.removeFlag(event.getFlag());
             }
             plot.setOwner(player.getUUID());
-            plot.getPlotModificationManager().setSign(player.getName());
             player.sendMessage(
                     TranslatableCaption.of("working.claimed"),
                     Template.of("plot", plot.getId().toString())

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

@@ -181,7 +181,6 @@ public class Download extends SubCommand {
                         schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() {
                             @Override
                             public void run(URL value) {
-                                plot.removeRunning();
                                 player.sendMessage(
                                         TranslatableCaption.of("web.generation_link_success"),
                                         Template.of("download", value.toString()),

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

@@ -32,6 +32,7 @@ import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
+import com.plotsquared.core.uuid.UUIDMapping;
 import net.kyori.adventure.text.minimessage.Template;
 
 import java.util.Collection;
@@ -39,7 +40,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
@@ -88,8 +88,8 @@ public class Grant extends Command {
                                 Template.of("value", String.valueOf(uuids))
                         );
                     } else {
-                        final UUID uuid = uuids.iterator().next();
-                        PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuid);
+                        final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
+                        PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuid.getUuid());
                         if (pp != null) {
                             try (final MetaDataAccess<Integer> access = pp.accessPersistentMetaData(
                                     PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
@@ -103,7 +103,7 @@ public class Grant extends Command {
                                 }
                             }
                         } else {
-                            DBFunc.getPersistentMeta(uuid, new RunnableVal<>() {
+                            DBFunc.getPersistentMeta(uuid.getUuid(), new RunnableVal<>() {
                                 @Override
                                 public void run(Map<String, byte[]> value) {
                                     final byte[] array = value.get("grantedPlots");
@@ -128,7 +128,7 @@ public class Grant extends Command {
                                         boolean replace = array != null;
                                         String key = "grantedPlots";
                                         byte[] rawData = Ints.toByteArray(amount);
-                                        DBFunc.addPersistentMeta(uuid, key, rawData, replace);
+                                        DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
                                         player.sendMessage(
                                                 TranslatableCaption.of("grants.added"),
                                                 Template.of("grants", String.valueOf(amount))

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

@@ -26,7 +26,6 @@ import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
 import net.kyori.adventure.text.minimessage.Template;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @CommandDeclaration(command = "near",
@@ -49,13 +48,9 @@ public class Near extends Command {
         final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
         player.sendMessage(
                 TranslatableCaption.of("near.plot_near"),
-                Template.of("list", StringMan.join(getPlayersInPlotVisible(plot, player), ", "))
+                Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", "))
         );
         return CompletableFuture.completedFuture(true);
     }
 
-    private List<PlotPlayer<?>> getPlayersInPlotVisible(Plot plot, PlotPlayer<?> executor) {
-        return plot.getPlayersInPlot().stream().filter(executor::canSee).toList();
-    }
-
 }

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -808,8 +808,6 @@ public class Settings extends Config {
         );
         @Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not")
         public static boolean USE_MVDWAPI = true;
-        @Comment("Prevent cross plot beacon effects")
-        public static boolean DISABLE_BEACON_EFFECT_OVERFLOW = true;
 
     }
 

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

@@ -28,17 +28,13 @@ import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.plot.BlockBucket;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.queue.GlobalBlockQueue;
-import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import javax.annotation.Nullable;
 
 @SuppressWarnings("WeakerAccess")
 public abstract class ClassicPlotWorld extends SquarePlotWorld {
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassicPlotWorld.class.getSimpleName());
 
     public int ROAD_HEIGHT = 62;
     public int PLOT_HEIGHT = 62;
@@ -125,15 +121,15 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         super.loadConfiguration(config);
         this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
         this.PLOT_HEIGHT = Math.min(getMaxGenHeight(), config.getInt("plot.height"));
-        this.MAIN_BLOCK = createCheckedBlockBucket(config.getString("plot.filling"), MAIN_BLOCK);
-        this.TOP_BLOCK = createCheckedBlockBucket(config.getString("plot.floor"), TOP_BLOCK);
-        this.WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block"), WALL_BLOCK);
+        this.MAIN_BLOCK = new BlockBucket(config.getString("plot.filling"));
+        this.TOP_BLOCK = new BlockBucket(config.getString("plot.floor"));
+        this.WALL_BLOCK = new BlockBucket(config.getString("wall.block"));
         this.ROAD_HEIGHT = Math.min(getMaxGenHeight(), config.getInt("road.height"));
-        this.ROAD_BLOCK = createCheckedBlockBucket(config.getString("road.block"), ROAD_BLOCK);
-        this.WALL_FILLING = createCheckedBlockBucket(config.getString("wall.filling"), WALL_FILLING);
+        this.ROAD_BLOCK = new BlockBucket(config.getString("road.block"));
+        this.WALL_FILLING = new BlockBucket(config.getString("wall.filling"));
         this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
         this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
-        this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
+        this.CLAIMED_WALL_BLOCK = new BlockBucket(config.getString("wall.block_claimed"));
     }
 
     int schematicStartHeight() {
@@ -144,19 +140,4 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         return Math.min(WALL_HEIGHT, plotRoadMin);
     }
 
-    private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) {
-        final BlockBucket bucket = new BlockBucket(input);
-        Pattern pattern = null;
-        try {
-            pattern = bucket.toPattern();
-        } catch (Exception ignore) {
-        }
-        if (pattern == null) {
-            LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input);
-            LOGGER.error("Falling back to {}", def);
-            return def;
-        }
-        return bucket;
-    }
-
 }

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

@@ -67,13 +67,10 @@ import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -85,7 +82,6 @@ public class PlotListener {
 
     private final HashMap<UUID, Interval> feedRunnable = new HashMap<>();
     private final HashMap<UUID, Interval> healRunnable = new HashMap<>();
-    private final Map<UUID, List<StatusEffect>> playerEffects = new HashMap<>();
 
     private final EventDispatcher eventDispatcher;
 
@@ -135,17 +131,6 @@ public class PlotListener {
                     }
                 }
             }
-
-            if (!playerEffects.isEmpty()) {
-                long currentTime = System.currentTimeMillis();
-                for (Iterator<Map.Entry<UUID, List<StatusEffect>>> iterator =
-                     playerEffects.entrySet().iterator(); iterator.hasNext(); ) {
-                    Map.Entry<UUID, List<StatusEffect>> entry = iterator.next();
-                    List<StatusEffect> effects = entry.getValue();
-                    effects.removeIf(effect -> currentTime > effect.expiresAt);
-                    if (effects.isEmpty()) iterator.remove();
-                }
-            }
         }, TaskTime.seconds(1L));
     }
 
@@ -375,17 +360,6 @@ public class PlotListener {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             final Plot previous = lastPlot.remove();
             this.eventDispatcher.callLeave(player, plot);
-
-            List<StatusEffect> effects = playerEffects.remove(player.getUUID());
-            if (effects != null) {
-                long currentTime = System.currentTimeMillis();
-                effects.forEach(effect -> {
-                    if (currentTime <= effect.expiresAt) {
-                        player.removeEffect(effect.name);
-                    }
-                });
-            }
-
             if (plot.hasOwner()) {
                 PlotArea pw = plot.getArea();
                 if (pw == null) {
@@ -494,23 +468,6 @@ public class PlotListener {
     public void logout(UUID uuid) {
         feedRunnable.remove(uuid);
         healRunnable.remove(uuid);
-        playerEffects.remove(uuid);
-    }
-
-    /**
-     * Marks an effect as a status effect that will be removed on leaving a plot
-     * @param uuid The uuid of the player the effect belongs to
-     * @param name The name of the status effect
-     * @param expiresAt The time when the effect expires
-     * @since 6.10.0
-     */
-    public void addEffect(@NonNull UUID uuid, @NonNull String name, long expiresAt) {
-        List<StatusEffect> effects = playerEffects.getOrDefault(uuid, new ArrayList<>());
-        effects.removeIf(effect -> effect.name.equals(name));
-        if (expiresAt != -1) {
-            effects.add(new StatusEffect(name, expiresAt));
-        }
-        playerEffects.put(uuid, effects);
     }
 
     private static class Interval {
@@ -528,13 +485,4 @@ public class PlotListener {
 
     }
 
-    private record StatusEffect(@NonNull String name, long expiresAt) {
-
-        private StatusEffect(@NonNull String name, long expiresAt) {
-                this.name = name;
-                this.expiresAt = expiresAt;
-            }
-
-        }
-
 }

Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java

@@ -246,10 +246,6 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
         return PlotSquared.platform().consoleAudience();
     }
 
-    @Override
-    public void removeEffect(@NonNull String name) {
-    }
-
     @Override
     public boolean canSee(final PlotPlayer<?> other) {
         return true;

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -1016,14 +1016,6 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         return this.lockRepository;
     }
 
-    /**
-     * Removes any effects present of the given type.
-     *
-     * @param name the name of the type to remove
-     * @since 6.10.0
-     */
-    public abstract void removeEffect(@NonNull String name);
-
     @FunctionalInterface
     public interface PlotPlayerConverter<BaseObject> {
 

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

@@ -457,7 +457,7 @@ public class Plot {
      * that could alter the de facto owner of the plot.
      *
      * @return The plot owner of this particular (sub-)plot
-     *         as stored in the database, if one exists. Else, null.
+     * as stored in the database, if one exists. Else, null.
      */
     public @Nullable UUID getOwnerAbs() {
         return this.owner;

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -23,7 +23,6 @@ import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
 import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag;
 import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag;
 import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag;
-import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
@@ -138,7 +137,6 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE);
         this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE);
         this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE);
-        this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
         this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
         this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
         this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java

@@ -1,39 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.plot.flag.implementations;
-
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public class BeaconEffectsFlag extends BooleanFlag<BeaconEffectsFlag> {
-
-    public static final BeaconEffectsFlag BEACON_EFFECT_TRUE = new BeaconEffectsFlag(true);
-    public static final BeaconEffectsFlag BEACON_EFFECT_FALSE = new BeaconEffectsFlag(false);
-
-    private BeaconEffectsFlag(boolean value){
-        super(value, TranslatableCaption.of("flags.flag_description_beacon_effect"));
-    }
-
-    @Override
-    protected BeaconEffectsFlag flagOf(@NonNull final Boolean value) {
-        return value ? BEACON_EFFECT_TRUE : BEACON_EFFECT_FALSE;
-    }
-
-}

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

@@ -618,7 +618,6 @@
   "flags.flag_description_prevent_creative_copy": "<gray>Prevents people from copying item NBT data in the plot unless they're added as members.</gray>",
   "flags.flag_description_leaf_decay": "<gray>Set to `false` to prevent leaves from decaying.",
   "flags.flag_description_projectiles": "<gray>Prevents guests from shooting projectiles on the plot when set to false.</gray>",
-  "flags.flag_description_beacon_effect": "<gray>Enables beacon effects on the plot.</gray>",
   "flags.flag_error_boolean": "Flag value must be a boolean (true | false).",
   "flags.flag_error_enum": "Must be one of: <list>",
   "flags.flag_error_integer": "Flag value must be a whole positive number.",

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.10.1"
+version = "6.9.4-SNAPSHOT"
 
 subprojects {
     group = rootProject.group
@@ -65,12 +65,12 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.15"))
+        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.12"))
     }
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
     }
 
     plugins.withId("java") {
@@ -174,7 +174,10 @@ subprojects {
     tasks {
 
         compileJava {
-            options.compilerArgs.add("-parameters")
+            options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
+            options.compilerArgs.add("-Xlint:all")
+            for (disabledLint in arrayOf("processing", "path", "fallthrough", "serial"))
+                options.compilerArgs.add("-Xlint:$disabledLint")
             options.isDeprecation = true
             options.encoding = "UTF-8"
         }

gradle/libs.versions.toml

@@ -2,19 +2,19 @@
 # Platform expectations
 paper = "1.18.1-R0.1-SNAPSHOT"
 guice = "5.1.0"
-spotbugs = "4.7.2"
+spotbugs = "4.7.1"
 
 # Plugins
-worldedit = "7.2.12"
+worldedit = "7.2.10"
 placeholderapi = "2.11.2"
 luckperms = "5.4"
-essentialsx = "2.19.7"
+essentialsx = "2.19.4"
 mvdwapi = "3.1.1"
 
 # Third party
 prtree = "2.0.0"
 aopalliance = "1.0"
-cloud-services = "1.7.1"
+cloud-services = "1.7.0"
 arkitektonika = "2.1.1"
 squirrelid = "0.3.1"
 http4j = "1.3"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -1,8 +1,6 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
-    ":semanticCommitsDisabled"
+    "config:base"
   ],
   "labels": ["Renovate"],
   "rebaseWhen": "conflicted"