From f39532f554eb1b0f7171ed90ef81ea28fccf75be Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 16 Feb 2023 12:49:28 +0100
Subject: Removed Fixing Skytils custom Damage Splash.

---
 CHANGELOG.md                                                        | 3 +++
 FEATURES.md                                                         | 1 -
 src/main/java/at/hannibal2/skyhanni/config/features/Misc.java       | 6 ------
 .../skyhanni/features/damageindicator/DamageIndicatorManager.kt     | 4 ----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf2b3a191..00899908e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@
 + Barbarian Duke Damage Indicator now only starts displaying after the player is getting close to him. (30 blocks)
 + Fixed a bug that caused fire veil particle `hider/redline drawer` to not always detect the right click correctly.
 
+### Removed
++ Removed `Fixing Skytils custom Damage Splash` (Skytils has already fixed this bug. Additionally, this option enabled and skytils' damage splash disabled caused the hypixel damage splash to not show the tailing commas at all)
+
 ## Version 0.16 (2023-02-11)
 
 ## Features
diff --git a/FEATURES.md b/FEATURES.md
index 6b255f940..c64fef4c2 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -167,7 +167,6 @@
 - Allow to copy, paste, and mark selected text in signs (not visual, but it's working still)
 - Pet Display (showing the currently selected pet as GUI element, without any fancy XP or level or percentage, but with auto-pet support)
 - Hiding exp Bottles lying on the ground.
-- Fixing Skytils custom Damage Splash.
 - Gui element showing the real time.
 - Highlight the voidling extremist in pink color.
 - Highlight millenia aged blaze color in red
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 c84460492..e120bcf04 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -68,12 +68,6 @@ public class Misc {
     @ConfigEditorAccordion(id = 4)
     public boolean damageSplash = false;
 
-    @Expose
-    @ConfigOption(name = "Skytils Damage Splash", desc = "Fixing the custom damage splash feature from skytils.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 4)
-    public boolean fixSkytilsDamageSplash = true;
-
     @Expose
     @ConfigOption(name = "Hide Damage Splash", desc = "Hide all damage splashes, from anywhere in Skyblock.")
     @ConfigEditorBoolean
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 44c2e47ad..5b8bc369d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -753,15 +753,11 @@ class DamageIndicatorManager {
         if (isDamageSplash(entity)) {
             val name = entity.customNameTag.removeColor().replace(",", "")
 
-            if (SkyHanniMod.feature.misc.fixSkytilsDamageSplash) {
-                entity.customNameTag = entity.customNameTag.replace(",", "")
-            }
             if (entityData != null) {
                 if (SkyHanniMod.feature.damageIndicator.hideDamageSplash) {
                     event.isCanceled = true
                 }
                 if (entityData.bossType == BossType.DUMMY) {
-
                     val uuid = entity.uniqueID
                     if (dummyDamageCache.contains(uuid)) return
                     dummyDamageCache.add(uuid)
-- 
cgit