From ea1a2980a6cb6b465c1f6911c959335aca25cb80 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Wed, 24 Aug 2022 17:21:32 +0200 Subject: hiding damage splashes while inside the boss room (fixing Skytils feature) --- .../java/at/hannibal2/skyhanni/data/HypixelData.kt | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index 98370fee7..91e1240a5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -2,12 +2,10 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.LocationChangeEvent import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.TabListUtils import net.minecraft.client.Minecraft -import net.minecraft.network.play.server.S38PacketPlayerListItem import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent @@ -18,7 +16,6 @@ class HypixelData { companion object { var hypixel = false var skyblock = false - var dungeon = false var mode: String = "" } @@ -32,32 +29,15 @@ class HypixelData { val areaRegex = Regex("§r§b§l(?[\\w]+): §r§7(?[\\w ]+)§r") - @SubscribeEvent - fun onTabUpdate(event: PacketEvent.ReceiveEvent) { - if (dungeon || !hypixel || event.packet !is S38PacketPlayerListItem || - (event.packet.action != S38PacketPlayerListItem.Action.UPDATE_DISPLAY_NAME && - event.packet.action != S38PacketPlayerListItem.Action.ADD_PLAYER) - ) return - event.packet.entries.forEach { playerData -> - val name = playerData?.displayName?.formattedText ?: playerData?.profile?.name ?: return@forEach - areaRegex.matchEntire(name)?.let { result -> - dungeon = skyblock && result.groups["area"]?.value == "Dungeon" - return@forEach - } - } - } - @SubscribeEvent fun onWorldChange(event: WorldEvent.Load) { skyblock = false - dungeon = false } @SubscribeEvent fun onDisconnect(event: FMLNetworkEvent.ClientDisconnectionFromServerEvent) { hypixel = false skyblock = false - dungeon = false } @SubscribeEvent -- cgit