From d743f928ad3dfb7c7f288e64c0a0fd50c702a042 Mon Sep 17 00:00:00 2001
From: pop4959 <pop4959@gmail.com>
Date: Wed, 1 Jul 2020 14:06:49 -0700
Subject: [PATCH] Ignore NPCs in EntityCombustByEntityEvent (#3389)

---
 .../com/earth2me/essentials/EssentialsEntityListener.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
index 4efa3a56b..52e430efa 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
@@ -130,7 +130,11 @@ public class EssentialsEntityListener implements Listener {
         if (event.getCombuster() instanceof Arrow && event.getEntity() instanceof Player) {
             Arrow combuster = (Arrow) event.getCombuster();
             if (combuster.getShooter() instanceof Player) {
-                final User srcCombuster = ess.getUser(((Player) combuster.getShooter()).getUniqueId());
+                Player shooter = (Player) combuster.getShooter();
+                if (shooter.hasMetadata("NPC")) {
+                    return;
+                }
+                final User srcCombuster = ess.getUser(shooter.getUniqueId());
                 if (srcCombuster.isGodModeEnabled() && !srcCombuster.isAuthorized("essentials.god.pvp")) {
                     event.setCancelled(true);
                 }