From a14c06c06aef1668a7f132b232a0edc565ee687f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 1 Oct 2022 19:16:44 +0200
Subject: used hasSkullTexture more often

---
 .../features/summonings/SummoningSoulsName.kt         | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/summonings')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
index c0ea8540b..7c6c889b5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.summonings
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.test.GriffinJavaUtils
 import at.hannibal2.skyhanni.utils.EntityUtils.getNameTagWith
-import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
+import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
@@ -48,7 +48,7 @@ class SummoningSoulsName {
             if (souls.contains(entity)) continue
 
             if (entity is EntityArmorStand) {
-                if (isSoul(entity)) {
+                if (entity.hasSkullTexture(texture)) {
                     val soulLocation = entity.getLorenzVec()
 
                     val map = mutableMapOf<EntityLiving, Double>()
@@ -111,21 +111,6 @@ class SummoningSoulsName {
         mobsName.clear()
     }
 
-    private fun isSoul(entity: EntityArmorStand): Boolean {
-        for (stack in entity.inventory) {
-            if (stack != null) {
-                val skullTexture = stack.getSkullTexture()
-                if (skullTexture != null) {
-                    if (skullTexture == texture) {
-                        return true
-                    }
-                }
-            }
-        }
-
-        return false
-    }
-
     private fun isEnabled(): Boolean {
         return LorenzUtils.inSkyblock && SkyHanniMod.feature.summonings.summoningSoulDisplay
     }
-- 
cgit