Skip to content
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

Jump to bottom

Fix Linear pattern index incrementing above array length #2626

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Fix Linear pattern index incrementing above array length #2626

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be4c6ea
Fix index incrementing above array length in async
Zeranny Mar 16, 2024
3911e32
Add fork method
Zeranny Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 14 additions & 9 deletions ...t-core/src/main/java/com/fastasyncworldedit/core/function/pattern/LinearBlockPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package com.fastasyncworldedit.core.function.pattern;

import com.fastasyncworldedit.core.queue.Filter;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.pattern.AbstractPattern;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;

import java.util.Arrays;

public class LinearBlockPattern extends AbstractPattern implements ResettablePattern {

private final Pattern[] patternsArray;
Expand All @@ -15,26 +18,28 @@ public class LinearBlockPattern extends AbstractPattern implements ResettablePat
/**
* Create a new {@link Pattern} instance
*
* @param patterns array of patterns to linearly choose from based on x/z coordinates
* @param patterns array of patterns to linearly choose from
*/
public LinearBlockPattern(Pattern[] patterns) {
this.patternsArray = patterns;
}

@Override
public BaseBlock applyBlock(BlockVector3 position) {
if (index == patternsArray.length) {
index = 0;
}
return patternsArray[index++].applyBlock(position);
index = (index + 1) % patternsArray.length;
return patternsArray[index].applyBlock(position);
}

@Override
public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
if (index == patternsArray.length) {
index = 0;
}
return patternsArray[index++].apply(extent, get, set);
index = (index + 1) % patternsArray.length;
return patternsArray[index].apply(extent, get, set);
}

@Override
public Filter fork() {
final Pattern[] forked = Arrays.stream(this.patternsArray).map(Pattern::fork).toArray(Pattern[]::new);
return new LinearBlockPattern(forked);
}

@Override
Expand Down