Upstream
/
EpicBosses
mirror of https://github.com/songoda/EpicBosses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Boss minion targeting issues are now resolved.

This commit is contained in:
Brianna 2019-10-08 01:25:47 -04:00
parent 91b7efd71e
commit e5eddd4e5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossMinionTargetListener.java
View File

@ -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;
}