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

Add setBiome override in MaskingExtent. #2709

Merged
merged 1 commit into from
Feb 2, 2025
Merged

Add setBiome override in MaskingExtent. #2709

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
6 changes: 0 additions & 6 deletions worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.Locatable;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.function.RegionMaskingFilter;
import com.sk89q.worldedit.function.biome.BiomeReplace;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.function.visitor.RegionVisitor;
import com.sk89q.worldedit.math.BlockVector3;
Expand Down Expand Up @@ -173,7 +171,6 @@ public void setBiome(Actor actor, World world, LocalSession session, EditSession
@Switch(name = 'p', desc = "Use your current position")
boolean atPosition) throws WorldEditException {
Region region;
Mask mask = editSession.getMask();

if (atPosition) {
if (actor instanceof Locatable) {
Expand All @@ -188,9 +185,6 @@ public void setBiome(Actor actor, World world, LocalSession session, EditSession
}

RegionFunction replace = new BiomeReplace(editSession, target);
if (mask != null) {
replace = new RegionMaskingFilter(mask, replace);
}
RegionVisitor visitor = new RegionVisitor(region, replace);
Operations.completeLegacy(visitor);

Expand Down
5 changes: 5 additions & 0 deletions worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockStateHolder;

import static com.google.common.base.Preconditions.checkNotNull;
Expand Down Expand Up @@ -69,4 +70,8 @@ public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 location, B
return mask.test(location) && super.setBlock(location, block);
}

@Override
public boolean setBiome(BlockVector3 location, BiomeType biome) {
return mask.test(location) && super.setBiome(location, biome);
}
}
Loading