catch & prevent potential issues related to dead NPCs

fixes #339
mcmonkeyprojects · May 11, 2020 · a401008 · a401008
1 parent 39e1de8
commit a401008
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelEventHandler.java b/src/main/java/org/mcmonkey/sentinel/SentinelEventHandler.java
@@ -117,10 +117,14 @@ public void whenAttacksAreHappening(EntityDamageByEntityEvent event) {
             sentinel.whenSomethingMightDie(victimUuid);
         }
         SentinelTrait victim = SentinelUtilities.tryGetSentinel(event.getEntity());
+        SentinelTrait attacker = SentinelUtilities.tryGetSentinel(event.getDamager());
         if (victim != null) {
+            if (attacker != null && victim.getNPC().getId() == attacker.getNPC().getId()) {
+                event.setCancelled(true);
+                return;
+            }
             victim.whenAttacksAreHappeningToMe(event);
         }
-        SentinelTrait attacker = SentinelUtilities.tryGetSentinel(event.getDamager());
         if (attacker != null) {
             attacker.whenAttacksAreHappeningFromMe(event);
         }
@@ -167,10 +171,14 @@ public void whenAttacksHappened(EntityDamageByEntityEvent event) {
             }
         }
         SentinelTrait victim = SentinelUtilities.tryGetSentinel(event.getEntity());
+        SentinelTrait attacker = SentinelUtilities.tryGetSentinel(damager);
         if (victim != null) {
+            if (attacker != null && victim.getNPC().getId() == attacker.getNPC().getId()) {
+                event.setCancelled(true);
+                return;
+            }
             victim.whenAttacksHappened(event);
         }
-        SentinelTrait attacker = SentinelUtilities.tryGetSentinel(damager);
         if (attacker != null) {
             attacker.whenAttacksHappened(event);
         }

diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java b/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java
@@ -659,6 +659,9 @@ public void whenAttacksAreHappeningToMe(EntityDamageByEntityEvent event) {
         if (event.isCancelled()) {
             return;
         }
+        if (!getNPC().isSpawned()) {
+            return;
+        }
         double armorLevel = getArmor(getLivingEntity());
         if (hitIsBlocked(event.getDamager())) {
             armorLevel = (1.0 - armorLevel) * 0.5 + armorLevel;
@@ -683,6 +686,9 @@ public void whenAttacksAreHappeningFromMe(EntityDamageByEntityEvent event) {
         if (event.isCancelled()) {
             return;
         }
+        if (!npc.isSpawned()) {
+            return;
+        }
         if (SentinelPlugin.instance.alternateDamage) {
             if (canEnforce) {
                 canEnforce = false;
@@ -716,6 +722,9 @@ public void whenAttacksAreHappeningFromMyArrow(EntityDamageByEntityEvent event)
         if (event.isCancelled()) {
             return;
         }
+        if (!npc.isSpawned()) {
+            return;
+        }
         if (SentinelPlugin.instance.alternateDamage) {
             if (canEnforce) {
                 canEnforce = false;

diff --git a/src/main/java/org/mcmonkey/sentinel/targeting/SentinelTargetList.java b/src/main/java/org/mcmonkey/sentinel/targeting/SentinelTargetList.java
@@ -46,6 +46,9 @@ public SentinelTargetList duplicate() {
         return result;
     }
 
+    /**
+     * Initialize the targets list after loading it.
+     */
     public void init() {
         recalculateTargetsCache();
         for (String str : new ArrayList<>(byEvent)) {