From 1bcba1c08ddd689298604fbc038e01defbe3d9cb Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 27 Jan 2021 08:57:06 +0200
Subject: [PATCH] Fixed shield effect affecting items and the caster when
 sneaking

---
 .../ability/magic/spell/ShieldSpell.java      | 20 ++++---------------
 .../unicopia/entity/player/Pony.java          |  5 +++++
 2 files changed, 9 insertions(+), 16 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 c35b73a0..ed26503f 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
@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 
 import com.minelittlepony.unicopia.Affinity;
 import com.minelittlepony.unicopia.EquinePredicates;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.ability.magic.Attached;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.entity.player.Pony;
@@ -15,6 +16,7 @@ import com.minelittlepony.unicopia.projectile.ProjectileUtil;
 import com.minelittlepony.unicopia.util.shape.Sphere;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.sound.SoundEvents;
@@ -98,21 +100,7 @@ public class ShieldSpell extends AbstractRangedAreaSpell implements Attached {
         boolean ownerIsValid = source.getAffinity() != Affinity.BAD && EquinePredicates.PLAYER_UNICORN.test(owner);
 
         return source.findAllEntitiesInRange(radius)
-            .filter(entity -> {
-                if (!ownerIsValid) {
-                    return true;
-                }
-
-                boolean ownerEquals = (
-                        entity.equals(owner)
-                    || (entity instanceof PlayerEntity && owner instanceof PlayerEntity && Pony.equal((PlayerEntity)entity, (PlayerEntity)owner)));
-
-                if (!owner.isSneaking()) {
-                    return ownerEquals;
-                }
-
-                return !ownerEquals;
-            })
+            .filter(entity -> !(entity instanceof ItemEntity || (ownerIsValid && Pony.equal(entity, owner))))
             .collect(Collectors.toList());
     }
 
@@ -128,7 +116,7 @@ public class ShieldSpell extends AbstractRangedAreaSpell implements Attached {
 
                 applyRadialEffect(source, i, dist, radius);
             } catch (Throwable e) {
-                e.printStackTrace();
+                Unicopia.LOGGER.error("Error updating shield effect", e);
             }
         });
 
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index b623ed1c..1f450e7e 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
@@ -1,6 +1,7 @@
 package com.minelittlepony.unicopia.entity.player;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.annotation.Nullable;
@@ -476,6 +477,10 @@ public class Pony implements Caster<PlayerEntity>, Equine<PlayerEntity>, Transmi
         return one == two || (one != null && two != null && one.getId().equals(two.getId()));
     }
 
+    public static boolean equal(Entity one, Entity two) {
+        return Objects.equals(one, two) || (one instanceof PlayerEntity && two instanceof PlayerEntity && equal((PlayerEntity)one, (PlayerEntity)two));
+    }
+
     public static boolean equal(PlayerEntity one, PlayerEntity two) {
         return one == two || (one != null && two != null && equal(one.getGameProfile(), two.getGameProfile()));
     }