PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Prevent sombra from targetting things it shouldn't

Browse source
This commit is contained in:
Sollace 2023-09-28 21:54:30 +01:00
parent 48f9d6242c
commit 8f2cd29488
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
View file

@ -7,6 +7,7 @@ import java.util.stream.Stream;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell; import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell;
import com.minelittlepony.unicopia.advancement.UCriteria; import com.minelittlepony.unicopia.advancement.UCriteria;
@ -579,7 +580,9 @@ public class SombraEntity extends HostileEntity implements ArenaCombatant, Parti
@Override @Override
public boolean canTarget(LivingEntity target) { public boolean canTarget(LivingEntity target) {
if (target instanceof PlayerEntity player && (player.isCreative() || player.isSpectator())) { if (target instanceof SombraEntity
|| EquinePredicates.IS_MAGIC_IMMUNE.test(target)
|| !EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR.test(target)) {
return false; return false;
} }