File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed
src/main/kotlin/com/lambda/config/groups Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ import net.minecraft.client.network.ClientPlayerEntity
3333import net.minecraft.client.network.OtherClientPlayerEntity
3434import net.minecraft.entity.LivingEntity
3535import net.minecraft.entity.decoration.ArmorStandEntity
36+ import net.minecraft.entity.mob.HostileEntity
3637import net.minecraft.entity.mob.MobEntity
3738import net.minecraft.entity.passive.PassiveEntity
3839import 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
You can’t perform that action at this time.
0 commit comments