avoid quadratic overhead for UUID collection

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,6 @@ 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'

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;
 
@@ -536,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);
@@ -568,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;
@@ -685,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);
@@ -699,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/PaperListener.java

@@ -229,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);

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/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/util/placeholders/PlaceholderRegistry.java

@@ -164,7 +164,7 @@ public final class PlaceholderRegistry {
                     PlayerManager.getPlayerList(plot.getDenied(), player));
         });
         this.createPlaceholder("currentplot_creationdate", (player, plot) -> {
-            if (plot.getTimestamp() == 0 || !plot.hasOwner()) {
+            if (plot.getTimestamp() == 0) {
                 return legacyComponent(TranslatableCaption.of("info.unknown"), player);
             }
             long creationDate = plot.getTimestamp();

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.9.5-SNAPSHOT"
+version = "6.9.4-SNAPSHOT"
 
 subprojects {
     group = rootProject.group
@@ -65,7 +65,7 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.13"))
+        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.12"))
     }
 
     dependencies {

gradle/libs.versions.toml

@@ -5,16 +5,16 @@ guice = "5.1.0"
 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"