Skip to content

Commit 5e9c94c

Browse files
committed
fixed entity targetting
1 parent cfee4b2 commit 5e9c94c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import net.minecraft.client.network.ClientPlayerEntity
3333
import net.minecraft.client.network.OtherClientPlayerEntity
3434
import net.minecraft.entity.LivingEntity
3535
import net.minecraft.entity.decoration.ArmorStandEntity
36+
import net.minecraft.entity.mob.HostileEntity
3637
import net.minecraft.entity.mob.MobEntity
3738
import net.minecraft.entity.passive.PassiveEntity
3839
import java.util.*
@@ -115,9 +116,10 @@ abstract class Targeting(
115116
* @return `true` if the entity is valid for targeting, `false` otherwise.
116117
*/
117118
open fun validate(player: ClientPlayerEntity, entity: LivingEntity) = when {
118-
!players || (entity is OtherClientPlayerEntity && entity.isFriend) -> false
119+
!players && entity is OtherClientPlayerEntity -> false
120+
players && entity is OtherClientPlayerEntity && entity.isFriend -> false
119121
!animals && entity is PassiveEntity -> false
120-
!hostiles && entity is MobEntity -> false
122+
!hostiles && entity is HostileEntity -> false
121123
entity is ArmorStandEntity -> false
122124

123125
!invisible && entity.isInvisibleTo(player) -> false

0 commit comments

Comments
 (0)