Skip to content

Fix cross-region block access and replaced block checks #2321

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
me4502 merged 4 commits into from
Nov 2, 2026
Merged

Fix cross-region block access and replaced block checks #2321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20a22ae
fix: some things were read of the wrong thread on folia
byPixelTV Oct 27, 2026
348ae1b
Merge branch 'EngineHub:version/7.0.x' into version/7.0.x
byPixelTV Nov 1, 2026
6cff74a
fix: move Folia ownership check into getFirstBlock
byPixelTV Nov 1, 2026
ff72d9b
fix: address Folia block lookup review feedback
byPixelTV Nov 2, 2026
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
3 changes: 2 additions & 1 deletion worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ public Entity getFirstNonPlayerEntity() {
@Nullable
public Block getFirstBlock() {
for (Object object : causes) {
if (object instanceof Block b) {
if (object instanceof Block b && (!WorldGuardPlugin.inst().isFolia()
|| Bukkit.isOwnedByCurrentRegion(b.getLocation()))) {
return b;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public void onBlockPlace(BlockPlaceEvent event) {
BlockState previousState = event.getBlockReplacedState();

// Some blocks, like tall grass and fire, get replaced
if (previousState.getType() != Material.AIR && previousState.getType() != event.getBlockReplacedState().getType()) {
if (previousState.getType() != Material.AIR && previousState.getType() != event.getBlockPlaced().getType()) {
Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), previousState.getLocation(), previousState.getType()));
}

Expand Down
Loading