From e5eddd4e5c79ecc255ed6c838550101c9c1a87bf Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Tue, 8 Oct 2019 01:25:47 -0400
Subject: [PATCH] Boss minion targeting issues are now resolved.

---
 .../listeners/during/BossMinionTargetListener.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossMinionTargetListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossMinionTargetListener.java
index 433eec6..dc4eb2a 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossMinionTargetListener.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossMinionTargetListener.java
@@ -28,7 +28,7 @@ public class BossMinionTargetListener implements Listener {
         Entity entityTargeting = event.getEntity();
         LivingEntity entityTargeted = event.getTarget();
 
-        if (entityTargeting == null || entityTargeted == null) return;
+        if (entityTargeted == null) return;
         if (!(entityTargeting instanceof LivingEntity)) return;
 
         LivingEntity livingEntity = (LivingEntity) entityTargeting;
@@ -38,14 +38,14 @@ public class BossMinionTargetListener implements Listener {
 
         if (targetingBossHolder != null) {
             for (ActiveMinionHolder minionHolder : targetingBossHolder.getActiveMinionHolderMap().values()) {
-                if (minionHolder.getLivingEntityMap().containsValue(entityTargeted)) {
+                if (minionHolder.getLivingEntityMap().containsValue(entityTargeted.getUniqueId())) {
                     event.setCancelled(true);
                     return;
                 }
             }
         } else if (targetedBossHolder != null) {
             for (ActiveMinionHolder minionHolder : targetedBossHolder.getActiveMinionHolderMap().values()) {
-                if (minionHolder.getLivingEntityMap().containsValue(entityTargeting)) {
+                if (minionHolder.getLivingEntityMap().containsValue(entityTargeting.getUniqueId())) {
                     event.setCancelled(true);
                     return;
                 }