From 529639fdd0683066eadffe93473a300a2177c008 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Thu, 13 Jun 2024 22:21:50 +0200 Subject: Backend: for each (#1725) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../features/summonings/SummoningMobManager.kt | 43 +++++++++++----------- 1 file changed, 21 insertions(+), 22 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 8bea95eb4..8194e7b6d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt @@ -98,33 +98,32 @@ object SummoningMobManager { } if (searchArmorStands) { - EntityUtils.getEntities().filter { it !in summoningMobNametags } - .forEach { - val name = it.displayName.unformattedText - healthPattern.matchMatcher(name) { - val playerName = LorenzUtils.getPlayerName() - if (name.contains(playerName)) { - summoningMobNametags.add(it) - if (summoningMobNametags.size == summoningsSpawned) { - searchArmorStands = false - } + for (it in EntityUtils.getEntities().filter { it !in summoningMobNametags }) { + val name = it.displayName.unformattedText + healthPattern.matchMatcher(name) { + val playerName = LorenzUtils.getPlayerName() + if (name.contains(playerName)) { + summoningMobNametags.add(it) + if (summoningMobNametags.size == summoningsSpawned) { + searchArmorStands = false } } } + } } - if (searchMobs) { - val playerLocation = LocationUtils.playerLocation() - EntityUtils.getEntities().filter { - it !in summoningMobs.keys && it.getLorenzVec() - .distance(playerLocation) < 10 && it.ticksExisted < 2 - }.forEach { - summoningMobs[it] = SummoningMob(System.currentTimeMillis(), name = "Mob") - it.setColor(LorenzColor.GREEN) - updateData() - if (summoningMobs.size == summoningsSpawned) { - searchMobs = false - } + if (!searchMobs) return + val playerLocation = LocationUtils.playerLocation() + val list = EntityUtils.getEntities().filter { + it !in summoningMobs.keys && it.getLorenzVec() + .distance(playerLocation) < 10 && it.ticksExisted < 2 + } + for (entity in list) { + summoningMobs[entity] = SummoningMob(System.currentTimeMillis(), name = "Mob") + entity.setColor(LorenzColor.GREEN) + updateData() + if (summoningMobs.size == summoningsSpawned) { + searchMobs = false } } } -- cgit