From c415d17ef2e5bb5a7b5768d3f38dbd703f5efa2a Mon Sep 17 00:00:00 2001 From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:37:22 -0500 Subject: [PATCH] remove: remove leftover bleeds --- .../gg/skytils/skytilsmod/core/Config.kt | 7 ------- .../features/impl/events/MayorDiana.kt | 20 ------------------- 2 files changed, 27 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index e40e81ba8..2ff918878 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1067,13 +1067,6 @@ object Config : Vigilant( ) var trackGaiaHits = false - /* @Property( - type = PropertyType.SWITCH, name = "Hide Leftover Bleeds", - description = "Removes the bleeds text left behind when a player dies to a Minotaur.", - category = "Events", subcategory = "Mythological" - )*/ - var removeLeftOverBleeds = false - @Property( type = PropertyType.SWITCH, name = "Track Mythological Creatures", description = "Tracks and saves drops from Mythological Creatures.", diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/events/MayorDiana.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/events/MayorDiana.kt index 575fa9f03..355a0f3af 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/events/MayorDiana.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/events/MayorDiana.kt @@ -57,26 +57,6 @@ object MayorDiana { } } - @SubscribeEvent - fun onCheckRender(event: CheckRenderEntityEvent<*>) { - if (!Utils.inSkyblock) return - val entity = event.entity - if (Skytils.config.removeLeftOverBleeds && mc.theWorld != null && entity is EntityArmorStand && entity.hasCustomName() && entity.displayName.formattedText.startsWith( - "§c☣ §fBleeds: §c" - ) && entity.ticksExisted >= 20 - ) { - val aabb = entity.entityBoundingBox.expand(2.0, 5.0, 2.0) - if (mc.theWorld.loadedEntityList.none { - it.displayName.formattedText.endsWith("§c❤") && it.displayName.formattedText.contains( - "Minotaur §" - ) && it.entityBoundingBox.intersectsWith(aabb) - }) { - event.isCanceled = true - mc.theWorld.removeEntity(entity) - } - } - } - @SubscribeEvent fun onPostRenderEntity(event: RenderLivingEvent.Post<*>) { if (!Utils.inSkyblock) return