Skip to content

Fix blacklisted blocks being pulled by pistons #3610

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
mdcfe merged 2 commits into from
Aug 21, 2020
Merged

Fix blacklisted blocks being pulled by pistons #3610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6875fa4
fix blacklisted blocks being pulled by sticky piston
triagonal Aug 21, 2020
bd1e624
clarify piston blacklist config comment
triagonal Aug 21, 2020
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
2 changes: 1 addition & 1 deletion Essentials/src/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ protect:
# Which blocks should people be prevented from breaking?
break:

# Which blocks should not be pushed by pistons?
# Which blocks should not be moved by pistons?
piston:

# Which blocks should not be dispensed by dispensers
Expand Down
8 changes: 5 additions & 3 deletions EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,11 @@ public void onBlockPistonRetract(final BlockPistonRetractEvent event) {
if (!event.isSticky()) {
return;
}
final Block block = event.getBlock();
if (prot.checkProtectionItems(AntiBuildConfig.blacklist_piston, block.getType())) {
event.setCancelled(true);
for (Block block : event.getBlocks()) {
if (prot.checkProtectionItems(AntiBuildConfig.blacklist_piston, block.getType())) {
event.setCancelled(true);
return;
}
}
}

Expand Down