Skip to content

fix: Operations in chunks containing Worldguard regions error #3700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mAxYoLo01 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −15
Open

fix: Operations in chunks containing Worldguard regions error #3700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/MultiRegionExtent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,7 @@ public boolean processGet(int chunkX, int chunkZ) {
}
}
}
if (!result || disallowed == null) {
return result;
}
for (Region region : disallowed) {
if (region.containsChunk(chunkX, chunkZ)) {
return false;
}
}
return true;
return result;
}

@Override
Expand Down
13 changes: 7 additions & 6 deletions worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@

package com.sk89q.worldedit.regions;

import java.util.List;
import java.util.Set;

import javax.annotation.Nullable;

import com.fastasyncworldedit.core.FaweCache;
import com.fastasyncworldedit.core.extent.SingleRegionExtent;
import com.fastasyncworldedit.core.extent.filter.block.ChunkFilterBlock;
import com.fastasyncworldedit.core.extent.processor.ProcessorScope;
import com.fastasyncworldedit.core.limit.FaweLimit;
import com.fastasyncworldedit.core.queue.Filter;
import com.fastasyncworldedit.core.queue.IBatchProcessor;
import com.fastasyncworldedit.core.queue.IChunk;
Expand All @@ -40,10 +44,6 @@
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockTypesCache;

import javax.annotation.Nullable;
import java.util.List;
import java.util.Set;

/**
* Represents a physical shape.
*/
Expand Down Expand Up @@ -476,7 +476,8 @@ default IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set, boolean
for (int y = 0, index = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++, index++) {
if (arr[index] != BlockTypesCache.ReservedIDs.__RESERVED__ && contains(x, y, z)) {
if (arr[index] != BlockTypesCache.ReservedIDs.__RESERVED__
&& contains(bx + x, by + y, bz + z)) {
arr[index] = BlockTypesCache.ReservedIDs.__RESERVED__;
processExtra = true;
}
Expand Down
Loading