Skip to content

Don't run AntiBuild checks on NPCs #5365

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
May 27, 2023
Merged

Don't run AntiBuild checks on NPCs #5365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2481e
Don't run AntiBuild checks on NPCs
JRoy May 27, 2023
3f1a5c4
Merge branch '2.x' into fix/npc-anti-build
JRoy May 27, 2023
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
15 changes: 15 additions & 0 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 @@ -192,6 +192,10 @@ public void onHangingBreak(final HangingBreakByEntityEvent event) {

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

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

if (!(event.getRightClicked() instanceof ItemFrame)) {
Expand Down Expand Up @@ -221,6 +225,10 @@ public void onItemFrameInteract(final PlayerInteractEntityEvent event) {

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

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

if (!(event.getRightClicked() instanceof ArmorStand)) {
Expand Down Expand Up @@ -319,6 +327,10 @@ public void onBlockPistonRetract(final BlockPistonRetractEvent event) {

@EventHandler(priority = EventPriority.LOW)
public void onPlayerInteract(final PlayerInteractEvent event) {
if (event.getPlayer().hasMetadata("NPC")) {
return;
}

// Do not return if cancelled, because the interact event has 2 cancelled states.
final User user = ess.getUser(event.getPlayer());
final ItemStack item = event.getItem();
Expand Down Expand Up @@ -415,6 +427,9 @@ public void onPlayerPickupItem(final EntityPickupItemEvent event) {
private class PlayerPickupItemListener implements Listener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerPickupItem(final PlayerPickupItemEvent event) {
if (event.getPlayer().hasMetadata("NPC")) {
return;
}

final User user = ess.getUser(event.getPlayer());
final ItemStack item = event.getItem().getItemStack();
Expand Down