From 0721f250f4519b45891b4ae169d5e20ef175b0c5 Mon Sep 17 00:00:00 2001
From: Walker Selby <git@walkerselby.com>
Date: Sun, 26 Nov 2023 07:28:18 +0000
Subject: Internal Change: Code Cleanup (#661)

Code cleanup #661
---
 .../skyhanni/features/misc/MarkedPlayerManager.kt          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index 66e379747..5409d956a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -16,6 +16,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class MarkedPlayerManager {
 
+    private val config get() = SkyHanniMod.feature.markedPlayers
+
     companion object {
         val playerNamesToMark = mutableListOf<String>()
         private val markedPlayers = mutableMapOf<String, EntityOtherPlayerMP>()
@@ -64,7 +66,7 @@ class MarkedPlayerManager {
 
     @SubscribeEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
-        SkyHanniMod.feature.markedPlayers.markOwnName.whenChanged { _, new ->
+        config.markOwnName.whenChanged { _, new ->
             val name = LorenzUtils.getPlayerName()
             if (new) {
                 if (!playerNamesToMark.contains(name)) {
@@ -87,8 +89,7 @@ class MarkedPlayerManager {
 
     @SubscribeEvent
     fun onRenderMobColored(event: RenderMobColoredEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.markedPlayers.highlightInWorld) return
+        if (!isEnabled()) return
 
         val entity = event.entity
         if (entity in markedPlayers.values) {
@@ -98,8 +99,7 @@ class MarkedPlayerManager {
 
     @SubscribeEvent
     fun onResetEntityHurtTime(event: ResetEntityHurtEvent) {
-        if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.markedPlayers.highlightInWorld) return
+        if (!isEnabled()) return
 
         val entity = event.entity
         if (entity in markedPlayers.values) {
@@ -112,11 +112,13 @@ class MarkedPlayerManager {
         if (Minecraft.getMinecraft().thePlayer == null) return
 
         markedPlayers.clear()
-        if (SkyHanniMod.feature.markedPlayers.markOwnName.get()) {
+        if (config.markOwnName.get()) {
             val name = LorenzUtils.getPlayerName()
             if (!playerNamesToMark.contains(name)) {
                 playerNamesToMark.add(name)
             }
         }
     }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.highlightInWorld
 }
-- 
cgit