Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
index a50479f6b..8d8a3ca40 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
@@ -13,6 +13,7 @@ import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.monster.EntityEnderman
 import net.minecraft.entity.monster.EntitySpider
+import net.minecraft.entity.monster.EntityCaveSpider
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class MobHighlight {
@@ -40,7 +41,7 @@ class MobHighlight {
         val entity = event.entity
         val maxHealth = event.maxHealth
         if (config.arachneKeeperHighlight) {
-            if (maxHealth == 3_000 && entity is EntitySpider) {
+            if (maxHealth == 3_000 && entity is EntityCaveSpider) {
                 RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_BLUE.toColor().withAlpha(127))
                 { config.arachneKeeperHighlight }
                 RenderLivingEntityHelper.setNoHurtTime(entity) { config.arachneKeeperHighlight }
@@ -106,4 +107,4 @@ class MobHighlight {
         { config.arachneBossHighlighter }
         RenderLivingEntityHelper.setNoHurtTime(entity) { config.arachneBossHighlighter }
     }
-}
\ No newline at end of file
+}