No more taking enemies into soulhomes. Better selective entities allo…

…wed to change dimensions.
leafreynolds · Jan 13, 2025 · ff0c810 · ff0c810
1 parent 366c796
commit ff0c810
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/main/java/leaf/soulhome/items/SoulKeyItem.java b/src/main/java/leaf/soulhome/items/SoulKeyItem.java
@@ -97,10 +97,10 @@ public void onUseTick(Level world, LivingEntity livingEntity, ItemStack stack, i
 
             for (int i = particlesToCreate; i >= 0; --i)
             {
-                float ang = (bits * i);// + (Math.random() * 10);
+                float ang = (bits * i);
 
                 livingEntity.level().addParticle(
-                        ParticleTypes.POOF,
+                        ParticleTypes.SOUL_FIRE_FLAME,
                         livingEntity.getX() + Mth.sin(Mth.wrapDegrees(ang)) * radius,
                         livingEntity.getY(),
                         livingEntity.getZ() + Mth.cos(Mth.wrapDegrees(ang)) * radius,

diff --git a/src/main/java/leaf/soulhome/utils/EntityHelper.java b/src/main/java/leaf/soulhome/utils/EntityHelper.java
@@ -5,10 +5,13 @@
 package leaf.soulhome.utils;
 
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.monster.Enemy;
 import net.minecraft.world.phys.AABB;
 
 import java.util.List;
+import java.util.function.Predicate;
 
 public class EntityHelper
 {
@@ -29,16 +32,27 @@ public static List<LivingEntity> getLivingEntitiesInRange(LivingEntity selfEntit
         return entitiesFound;
     }
 
+    private static final Predicate<Entity> ALLOWED_TO_TELEPORT =
+            EntitySelector.NO_SPECTATORS
+                    .and(EntitySelector.LIVING_ENTITY_STILL_ALIVE)
+                    .and(Entity::canChangeDimensions)
+                    .and((entity)->!(entity instanceof Enemy));
+
     public static List<Entity> getEntitiesInRange(Entity entity, double range, boolean includeSelf)
     {
         AABB areaOfEffect = new AABB(entity.blockPosition());
         areaOfEffect = areaOfEffect.inflate(range, range, range);
 
         List<Entity> entitiesFound = entity.level().getEntitiesOfClass(Entity.class, areaOfEffect);
 
-        if (!includeSelf)
+        for (Entity ent : entitiesFound)
         {
-            entitiesFound.remove(entity);
+            final boolean removeSelf = ent == entity && !includeSelf;
+            if (removeSelf || !ALLOWED_TO_TELEPORT.test(ent))
+            {
+                entitiesFound.remove(ent);
+                break;
+            }
         }
 
         return entitiesFound;