Skip to content

Commit 3a93e9e

Browse files
committed
fix boss entity selected checks not working in entity selection settings
1 parent 37c607e commit 3a93e9e

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/main/kotlin/com/lambda/config/groups/EntitySelectionSettings.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ class EntitySelectionSettings(
7070
SpawnGroup.AXOLOTLS,
7171
SpawnGroup.CREATURE,
7272
SpawnGroup.UNDERGROUND_WATER_CREATURE -> passiveEntityMap[name] in passiveEntities
73-
SpawnGroup.MONSTER -> mobEntityMap[name] in mobEntities
73+
SpawnGroup.MONSTER ->
74+
mobEntityMap[name] in mobEntities ||
75+
bossEntityMap[name] in bossEntities
7476
}
7577
}
7678

src/main/kotlin/com/lambda/config/groups/OutlineSettings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class OutlineSettings(
2929
vararg baseGroup: NamedEnum,
3030
override val visibility: () -> Boolean = { true },
3131
) : SettingGroup(c) {
32-
val thicknessSetting by c.setting("${prefix}Line Width", 40, 1..100, 1, "The width of the outline", visibility = visibility).group(*baseGroup).index()
32+
val thicknessSetting by c.setting("${prefix}Line Width", 25, 1..100, 1, "The width of the outline", visibility = visibility).group(*baseGroup).index()
3333
val thickness get() = thicknessSetting * 0.00005f
3434

3535
val glowIntensitySetting by c.setting("${prefix}Glow Intensity", 50, 0..100, 1, "Intensity of the outline glow", visibility = visibility).group(*baseGroup).index()

src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,21 @@ object KillAura : Module(
9090
applyEdits {
9191
hideAllGroupsExcept(buildConfig, hotbarConfig, rotationConfig)
9292
buildConfig.apply {
93-
hide(::pathing, ::stayInRange, ::collectDrops, ::spleefEntities, ::maxPendingActions, ::actionTimeout, ::maxBuildDependencies, ::blockReach)
93+
hide(
94+
::pathing, ::stayInRange, ::collectDrops,
95+
::spleefEntities, ::maxPendingActions, ::actionTimeout,
96+
::maxBuildDependencies, ::blockReach
97+
)
98+
}
99+
hotbarConfig.apply {
100+
::tickStageMask.edit { defaultValue(mutableSetOf(TickEvent.Pre)) }
94101
}
95102
}
96103
}
97104

98105
listen<InventoryEvent.HotbarSlot.Update> { cooldownFromSwap = true }
99106

100-
listen<TickEvent.Input.Post> {
107+
listen<TickEvent.Pre> {
101108
target?.let { entity ->
102109
// Wait until the rotation has a hit result on the entity
103110
var rotated = true

0 commit comments

Comments
 (0)