From bd6a0bb93ed6c0499cc3c5e044b7554481825bb5 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 28 Apr 2023 20:43:18 +0200 Subject: REGEX --- .../hannibal2/skyhanni/features/summonings/SummoningMobManager.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/summonings') diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt index edb2bc2ac..9aa9b2cf2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt @@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.utils.* import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings +import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import net.minecraft.client.Minecraft import net.minecraft.entity.EntityLiving import net.minecraft.entity.EntityLivingBase @@ -39,8 +40,7 @@ class SummoningMobManager { if (!LorenzUtils.inSkyBlock) return val message = event.message - val matcher = spawnPatter.matcher(message) - if (matcher.matches()) { + spawnPatter.matchMatcher(message) { if (SkyHanniMod.feature.summonings.summoningMobDisplay) { event.blockedReason = "summoning_soul" } @@ -79,8 +79,7 @@ class SummoningMobManager { Minecraft.getMinecraft().theWorld.loadedEntityList.filter { it is EntityArmorStand && it !in summoningMobNametags } .forEach { val name = it.displayName.unformattedText - val matcher = healthPattern.matcher(name) - if (matcher.matches()) { + healthPattern.matchMatcher(name) { val playerName = LorenzUtils.getPlayerName() if (name.contains(playerName)) { summoningMobNametags.add(it as EntityArmorStand) -- cgit