summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/summonings
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/summonings')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt6
2 files changed, 5 insertions, 5 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 cf69f0245..54e95cb2b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
@@ -75,7 +75,7 @@ class SummoningMobManager {
}
if (searchArmorStands) {
- EntityUtils.getAllEntities<EntityArmorStand>().filter { it !in summoningMobNametags }
+ EntityUtils.getEntities<EntityArmorStand>().filter { it !in summoningMobNametags }
.forEach {
val name = it.displayName.unformattedText
healthPattern.matchMatcher(name) {
@@ -92,7 +92,7 @@ class SummoningMobManager {
if (searchMobs) {
val playerLocation = LocationUtils.playerLocation()
- EntityUtils.getAllEntities<EntityLiving>().filter {
+ EntityUtils.getEntities<EntityLiving>().filter {
it !in summoningMobs.keys && it.getLorenzVec()
.distance(playerLocation) < 10 && it.ticksExisted < 2
}.forEach {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
index ad554d251..52cd428d6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt
@@ -40,7 +40,7 @@ class SummoningSoulsName {
private fun check() {
val minecraft = Minecraft.getMinecraft()
- for (entity in EntityUtils.getAllEntities<EntityArmorStand>()) {
+ for (entity in EntityUtils.getEntities<EntityArmorStand>()) {
if (souls.contains(entity)) continue
if (entity.hasSkullTexture(texture)) {
@@ -59,7 +59,7 @@ class SummoningSoulsName {
}
}
- for (entity in EntityUtils.getAllEntities<EntityLiving>()) {
+ for (entity in EntityUtils.getEntities<EntityLiving>()) {
val consumer = entity.getNameTagWith(2, "§c❤")
if (consumer != null) {
if (!consumer.name.contains("§e0")) {
@@ -69,7 +69,7 @@ class SummoningSoulsName {
}
}
- val entityList = EntityUtils.getAllEntities<EntityArmorStand>()
+ val entityList = EntityUtils.getEntities<EntityArmorStand>()
souls.keys.removeIf { it !in entityList }
//TODO fix overhead!
// mobs.keys.removeIf { it !in world.loadedEntityList }