Skip to content

Fix allowed regions handling #371

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

Draft
Aurelien30000 wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −0
Draft

Fix allowed regions handling #371

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
29 changes: 29 additions & 0 deletions src/main/java/com/thevoxelbox/voxelsniper/brush/type/AbstractBrush.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
package com.thevoxelbox.voxelsniper.brush.type;

import com.fastasyncworldedit.core.extent.FaweRegionExtent;
import com.fastasyncworldedit.core.extent.MultiRegionExtent;
import com.fastasyncworldedit.core.extent.SingleRegionExtent;
import com.fastasyncworldedit.core.limit.FaweLimit;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.registry.Keyed;
import com.sk89q.worldedit.registry.NamespacedRegistry;
import com.sk89q.worldedit.util.Direction;
Expand Down Expand Up @@ -60,6 +66,27 @@ protected void onBrushInfoCommand(Snipe snipe, Component component) {
sniper.print(component);
}

/**
* Set up the edit session.
* A region extent can be added in order to take into account region protections in brush computing.
*/
private void setupEditSession() {
Region[] allowedRegions = editSession.getAllowedRegions();
if (allowedRegions == null || allowedRegions.length == 0) {
return;
}

Extent extent = editSession.getExtent();
FaweLimit limit = editSession.getLimit();
FaweRegionExtent regionExtent;
if (allowedRegions.length == 1) {
regionExtent = new SingleRegionExtent(extent, limit, allowedRegions[0]);
} else {
regionExtent = new MultiRegionExtent(extent, limit, allowedRegions, null);
}
editSession.setExtent(regionExtent);
}

@Override
public void perform(
Snipe snipe,
Expand All @@ -71,6 +98,8 @@ public void perform(
this.editSession = editSession;
this.targetBlock = targetBlock;
this.lastBlock = lastBlock;
setupEditSession();

if (action == ToolAction.ARROW) {
handleArrowAction(snipe);
} else if (action == ToolAction.GUNPOWDER) {
Expand Down