avoid premature trimming

IntellectualSites · Oct 22, 2023 · 1c41ec6 · 1c41ec6
1 parent 6dfa7d1
commit 1c41ec6
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java
@@ -164,14 +164,23 @@ public IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) {
         int bz = chunk.getZ() << 4;
         int tx = bx + 15;
         int tz = bz + 15;
+        List<Region> intersecting = new ArrayList<>(2);
         for (Region region : regions) {
             BlockVector3 regMin = region.getMinimumPoint();
             BlockVector3 regMax = region.getMaximumPoint();
             if (tx >= regMin.getX() && bx <= regMax.getX() && tz >= regMin.getZ() && bz <= regMax.getZ()) {
-                return region.processSet(chunk, get, set);
+                intersecting.add(region);
             }
         }
-        return null;
+        if (intersecting.isEmpty()) {
+            return null;
+        }
+        if (intersecting.size() == 1) {
+            return intersecting.get(0).processSet(chunk, get, set);
+        }
+        // if multiple regions intersect with this chunk, we must be more careful, otherwise one region might trim content of
+        // another region
+        return super.processSet(chunk, get, set);
     }
 
     @Override