Skip to content

Fix //hollow not behaving correctly #3142

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

Merged
dordsor21 merged 8 commits into from
Mar 21, 2025
Merged

Fix //hollow not behaving correctly #3142

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f2661eb
Fix hollowOutRegion mutating vector
eztaK-red Mar 9, 2025
c294532
use existing mutable bv3 instead of new instances
eztaK-red Mar 10, 2025
1312e0a
Merge branch 'main' into fix-hollow
eztaK-red Mar 10, 2025
409459c
Fix recurseHollow behaving incorrectly
eztaK-red Mar 10, 2025
1489b31
add mutable bv3 to queue instead i guess
eztaK-red Mar 11, 2025
9173f15
fawe start/end markers
eztaK-red Mar 11, 2025
8e72ebd
Revert "fawe start/end markers"
eztaK-red Mar 11, 2025
c823d3b
correct fawe start/end markers
eztaK-red Mar 11, 2025
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
14 changes: 10 additions & 4 deletions worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3298,7 +3298,9 @@ public int hollowOutRegion(Region region, int thickness, Pattern pattern, Mask m
outer:
for (BlockVector3 position : region) {
for (BlockVector3 recurseDirection : recurseDirections) {
BlockVector3 neighbor = position.add(recurseDirection);
//FAWE start - mutable
BlockVector3 neighbor = mutable.setComponents(position).add(recurseDirection);
Comment thread
dordsor21 marked this conversation as resolved.
//FAWE end

if (outside.contains(neighbor)) {
newOutside.add(position);
Expand All @@ -3313,7 +3315,9 @@ public int hollowOutRegion(Region region, int thickness, Pattern pattern, Mask m
outer:
for (BlockVector3 position : region) {
for (BlockVector3 recurseDirection : recurseDirections) {
BlockVector3 neighbor = position.add(recurseDirection);
//FAWE start - mutable
BlockVector3 neighbor = mutable.setComponents(position).add(recurseDirection);
//FAWE end

if (outside.contains(neighbor)) {
continue outer;
Expand Down Expand Up @@ -3644,10 +3648,12 @@ public Set<BlockVector3> getHollowed(Set<BlockVector3> vset) {
}

private void recurseHollow(Region region, BlockVector3 origin, Set<BlockVector3> outside, Mask mask) {
// FAWE start - use BlockVector3Set instead of LinkedList
// FAWE start - use BlockVector3Set instead of LinkedList & mutable BV3
final BlockVector3Set queue = BlockVector3Set.getAppropriateVectorSet(region);
queue.add(origin);

MutableBlockVector3 mutable = new MutableBlockVector3();

while (!queue.isEmpty()) {
Iterator<BlockVector3> iter = queue.iterator();
while (iter.hasNext()) {
Expand All @@ -3664,7 +3670,7 @@ private void recurseHollow(Region region, BlockVector3 origin, Set<BlockVector3>
}

for (BlockVector3 recurseDirection : recurseDirections) {
queue.add(current.add(recurseDirection));
queue.add(mutable.setComponents(current).add(recurseDirection));
}
}
}
Expand Down
Loading