From 5608fb71917c12f065c1dd5ce319d08ec6850382 Mon Sep 17 00:00:00 2001
From: syeyoung <cyong06@naver.com>
Date: Sat, 27 Mar 2021 02:11:17 +0900
Subject: fix bannables

---
 .../syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java   | 2 ++
 .../dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java     | 1 +
 .../dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java        | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon')

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java
index a36a6f03..92df3989 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java
@@ -39,11 +39,13 @@ public class FeatureBoxBats extends SimpleFeature implements WorldRenderListener
         List<EntityBat> skeletonList = Minecraft.getMinecraft().theWorld.getEntities(EntityBat.class, new Predicate<EntityBat>() {
             @Override
             public boolean apply(@Nullable EntityBat input) {
+                if (input != null && input.isInvisible()) return false;
                 return input != null && input.getDistanceSq(player) < sq;
             }
         });
         AColor c = this.<AColor>getParameter("color").getValue();
         for (EntityBat entitySkeleton : skeletonList) {
+            if (!entitySkeleton.isInvisible())
             RenderUtils.highlightBox(entitySkeleton, c, partialTicks, true);
         }
     }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java
index 1786e7cf..545a5449 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java
@@ -40,6 +40,7 @@ public class FeatureBoxSkelemaster extends SimpleFeature implements WorldRenderL
             @Override
             public boolean apply(@Nullable EntityArmorStand input) {
                 if (player.distanceSq(input.getPosition()) > sq) return false;
+                if (input.isInvisible() || !input.getAlwaysRenderNameTag()) return false;
                 return input.getName().contains("Skeleton Master");
             }
         });
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java
index 670ad077..e647e0de 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java
@@ -39,12 +39,13 @@ public class FeatureBoxStarMobs extends SimpleFeature implements WorldRenderList
             @Override
             public boolean apply(@Nullable EntityArmorStand input) {
                 if (player.distanceSq(input.getPosition()) > sq) return false;
+                if (input.isInvisible() || !input.getAlwaysRenderNameTag()) return false;
                 return input.getName().contains("✯");
             }
         });
         AColor c = this.<AColor>getParameter("color").getValue();
         for (EntityArmorStand entitySkeleton : skeletonList) {
-            RenderUtils.highlightBox(entitySkeleton, c, partialTicks, true);
+                RenderUtils.highlightBox(entitySkeleton, c, partialTicks, true);
         }
     }
 }
-- 
cgit