Skip to content

AntiBuild: Properly handle shear interactions #6262

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
JRoy merged 2 commits into from
Sep 6, 2025
Merged

AntiBuild: Properly handle shear interactions #6262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec4340a
AntiBuild: Properly handle shear interactions
JRoy Aug 9, 2025
19fb226
Merge branch '2.x' into fix/6257
JRoy Aug 10, 2025
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
26 changes: 24 additions & 2 deletions ...ntiBuild/src/main/java/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,24 @@ public void onHangingBreak(final HangingBreakByEntityEvent event) {
}

@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onItemFrameInteract(final PlayerInteractEntityEvent event) {
public void onPlayerInteractEntity(final PlayerInteractEntityEvent event) {
if (event.getPlayer().hasMetadata("NPC")) {
return;
}

final User user = ess.getUser(event.getPlayer());

final ItemStack hand = event.getPlayer().getInventory().getItem(event.getHand());
if (hand != null && hand.getType() == Material.SHEARS) {
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !metaPermCheck(user, "interact", hand)) {
if (ess.getSettings().warnOnBuildDisallow()) {
user.sendTl("antiBuildUse", hand.getType().toString());
}
event.setCancelled(true);
return;
}
}

if (!(event.getRightClicked() instanceof ItemFrame)) {
return;
}
Expand All @@ -295,13 +306,24 @@ public void onItemFrameInteract(final PlayerInteractEntityEvent event) {
}

@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onArmorStandInteract(final PlayerInteractAtEntityEvent event) {
public void onPlayerInteractAtEntity(final PlayerInteractAtEntityEvent event) {
if (event.getPlayer().hasMetadata("NPC")) {
return;
}

final User user = ess.getUser(event.getPlayer());

final ItemStack hand = event.getPlayer().getInventory().getItem(event.getHand());
if (hand != null && hand.getType() == Material.SHEARS) {
if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !metaPermCheck(user, "interact", hand)) {
if (ess.getSettings().warnOnBuildDisallow()) {
user.sendTl("antiBuildUse", hand.getType().toString());
}
event.setCancelled(true);
return;
}
}

if (!(event.getRightClicked() instanceof ArmorStand)) {
return;
}
Expand Down
Loading