summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/summonings
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-28 20:43:18 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-28 20:43:29 +0200
commitbd6a0bb93ed6c0499cc3c5e044b7554481825bb5 (patch)
treebe2eea214952108ae8acd658f4646403129a3e28 /src/main/java/at/hannibal2/skyhanni/features/summonings
parent9df04ac5aaa5e9897324af306dc73b8b1e67f600 (diff)
downloadskyhanni-bd6a0bb93ed6c0499cc3c5e044b7554481825bb5.tar.gz
skyhanni-bd6a0bb93ed6c0499cc3c5e044b7554481825bb5.tar.bz2
skyhanni-bd6a0bb93ed6c0499cc3c5e044b7554481825bb5.zip
REGEX
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/summonings')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt7
1 files changed, 3 insertions, 4 deletions
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)