From 615e4c3788ef2b42f312c4819b295ae9516d0436 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 29 Jan 2021 19:02:04 +0200 Subject: [PATCH] Fixed the focused/unfocused forms of magic missile (whoops) --- .../unicopia/ability/magic/spell/ShieldSpell.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ShieldSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ShieldSpell.java index a92e5faa..cd410412 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ShieldSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ShieldSpell.java @@ -102,7 +102,7 @@ public class ShieldSpell extends AbstractRangedAreaSpell implements Attached { Entity owner = source.getMaster(); - boolean ownerIsValid = source.getAffinity() != Affinity.BAD && EquinePredicates.PLAYER_UNICORN.test(owner); + boolean ownerIsValid = source.getAffinity() != Affinity.BAD && (EquinePredicates.PLAYER_UNICORN.test(owner) && owner.isSneaking()); return source.findAllEntitiesInRange(radius) .filter(entity -> { @@ -115,8 +115,7 @@ public class ShieldSpell extends AbstractRangedAreaSpell implements Attached { || ProjectileUtil.isFlyingProjectile(entity) || entity instanceof AbstractMinecartEntity) && !(entity instanceof ArmorStandEntity) - && !(owner.isConnectedThroughVehicle(entity)) - && !(ownerIsValid && Pony.equal(entity, owner)); + && !(ownerIsValid && (Pony.equal(entity, owner) || owner.isConnectedThroughVehicle(entity))); }) .collect(Collectors.toList()); }