fixing custom damage splash form skytils, fixing 'hide damage splash next to damage indicator'

2 files changed, 15 insertions, 8 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index 23487a20d..51c97f995 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -29,6 +29,11 @@ public class Misc {
     public boolean summonSoulDisplay = false;
 
     @Expose
+    @ConfigOption(name = "Skytils Damage Splash", desc = "Fixing the custom damage splash feature from skytils.")
+    @ConfigEditorBoolean
+    public boolean fixSkytilsDamageSplash = true;
+
+    @Expose
     @ConfigOption(name = "Config Button", desc = "Add a button to the pause menu to configure SkyHanni.")
     @ConfigEditorBoolean
     public boolean configButtonOnPause = true;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index a95b1eda9..799d95b69 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -543,25 +543,27 @@ class DamageIndicatorManager {
         bossFinder?.handleNewEntity(event.entity)
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    @SubscribeEvent(priority = EventPriority.HIGH)
     fun onRenderLiving(e: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
-        if (!SkyHanniMod.feature.damageIndicator.hideDamageSplash) return
-
         val entity = e.entity
         if (entity.ticksExisted > 300 || entity !is EntityArmorStand) return
         if (!entity.hasCustomName()) return
         if (entity.isDead) return
-        val strippedName = entity.customNameTag.removeColor()
+        val strippedName = entity.customNameTag.removeColor().replace(",", "")
         val damageMatcher = damagePattern.matcher(strippedName)
-        if (damageMatcher.matches()) {
+        if (!damageMatcher.matches()) return
+
+        if (SkyHanniMod.feature.misc.fixSkytilsDamageSplash) {
+            entity.customNameTag = entity.customNameTag.replace(",", "")
+        }
+
+        if (SkyHanniMod.feature.damageIndicator.hideDamageSplash) {
             if (data.values.any {
                     val distance = it.entity.getLorenzVec().distance(entity.getLorenzVec())
-                    val found = distance < 4.5
-                    found
+                    distance < 4.5
                 }) {
                 e.isCanceled = true
             }
         }
     }
-
 }
\ No newline at end of file