Skip to content

Use RandomPattern instead of RandomStatePattern #3276

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
NotMyFault merged 1 commit into from
Aug 10, 2025
+11 −3
Merged

Use RandomPattern instead of RandomStatePattern #3276

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
14 changes: 11 additions & 3 deletions ...n/java/com/sk89q/worldedit/extension/factory/parser/pattern/RandomStatePatternParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomStatePattern;
import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.internal.registry.InputParser;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.FuzzyBlockState;

import java.util.Collections;
Expand Down Expand Up @@ -66,8 +67,15 @@ public Pattern parseFromInput(String input, ParserContext context) throws InputP
if (block.getStates().size() == block.getBlockType().getPropertyMap().size()) {
// they requested random with *, but didn't leave any states empty - simplify
return block;
} else if (block.toImmutableState() instanceof FuzzyBlockState) {
return new RandomStatePattern((FuzzyBlockState) block.toImmutableState());
// FAWE start - use RandomPattern instead of RandomStatePattern
} else if (block.toImmutableState() instanceof FuzzyBlockState fbs) {
RandomPattern randomPattern = new RandomPattern();
fbs.getBlockType().getAllStates().stream()
.filter(fbs::equalsFuzzy)
.map(BlockState::toBaseBlock)
.forEach(bb -> randomPattern.add(bb, 1.0));
return randomPattern;
// FAWE end
} else {
return null; // only should happen if parseLogic changes
}
Expand Down
Loading