Don't run AntiBuild checks on NPCs (#5365)

EssentialsX · May 27, 2023 · a4fb02f · a4fb02f
1 parent 2828901
commit a4fb02f
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/...ntiBuild/src/main/java/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/...ntiBuild/src/main/java/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
@@ -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)) {
@@ -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)) {
@@ -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();
@@ -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();