Merge remote-tracking branch 'origin/main' into fix/spigot

Author: PierreSchwang

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     jacoco
     id("buildlogic.common")
     id("com.gradleup.nmcp.aggregation") version "1.6.1"
-    id("xyz.jpenilla.run-paper") version "3.0.2"
+    id("xyz.jpenilla.run-paper") version "3.1.0"
 }
 
 val rootVersion: String = (extra.properties["rootVersion"] as? String) ?: "2.15.5"

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ worldguard-bukkit = "7.0.17"
 griefprevention = "18.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "6.0.2.3"
-towny = "0.103.2.0"
+towny = "0.103.2.2"
 plotsquared = "7.6.0"
 
 # Third party

worldedit-core/build.gradle.kts

@@ -62,6 +62,7 @@ dependencies {
     // Tests
     testRuntimeOnly(libs.log4j.core)
     testImplementation(libs.parallelgzip)
+    testImplementation(libs.sparsebitset)
 }
 
 tasks.test {

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/LocalBlockVectorSet.java

@@ -576,7 +576,7 @@ public boolean contains(Object o) {
 
         @Override
         public boolean add(BlockVector3 blockVector3) {
-            return set.add(blockVector3);
+            return add(blockVector3.x(), blockVector3.y(), blockVector3.z());
         }
 
         @Override
@@ -591,7 +591,11 @@ public boolean containsAll(@Nonnull Collection<?> c) {
 
         @Override
         public boolean addAll(@Nonnull Collection<? extends BlockVector3> c) {
-            return set.addAll(c);
+            boolean result = false;
+            for (BlockVector3 vector : c) {
+                result |= add(vector);
+            }
+            return result;
         }
 
         @Override

worldedit-core/src/test/java/com/fastasyncworldedit/core/math/LocalBlockVectorSetTest.java

@@ -0,0 +1,64 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit 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.fastasyncworldedit.core.math;
+
+import com.fastasyncworldedit.core.util.collection.BlockVector3Set;
+import com.sk89q.worldedit.math.BlockVector3;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class LocalBlockVectorSetTest {
+
+    @Test
+    void upgradesWhenBlockVectorIsOutsideLocalRange() {
+        BlockVector3Set set = LocalBlockVectorSet.wrapped();
+        BlockVector3 position = BlockVector3.at(-38, -357, -20);
+
+        assertTrue(set.add(position));
+        assertTrue(set.contains(position));
+    }
+
+    @Test
+    void retainsExistingVectorsWhenUpgraded() {
+        BlockVector3Set set = LocalBlockVectorSet.wrapped();
+        BlockVector3 originalPosition = BlockVector3.at(-38, 128, -20);
+        BlockVector3 positionOutsideLocalRange = BlockVector3.at(-38, -357, -20);
+
+        assertTrue(set.add(originalPosition));
+        assertTrue(set.add(positionOutsideLocalRange));
+        assertTrue(set.contains(originalPosition));
+        assertTrue(set.contains(positionOutsideLocalRange));
+    }
+
+    @Test
+    void upgradesWhenBulkAddingVectorsOutsideLocalRange() {
+        BlockVector3Set set = LocalBlockVectorSet.wrapped();
+        BlockVector3 positionInsideLocalRange = BlockVector3.at(-38, 128, -20);
+        BlockVector3 positionOutsideLocalRange = BlockVector3.at(-38, -357, -20);
+
+        assertTrue(set.addAll(List.of(positionInsideLocalRange, positionOutsideLocalRange)));
+        assertTrue(set.contains(positionInsideLocalRange));
+        assertTrue(set.contains(positionOutsideLocalRange));
+    }
+
+}