From 574c3cd80d210b694aa35b29dfe03e4ecfc04bba Mon Sep 17 00:00:00 2001 From: John Yorke Date: Sun, 28 Nov 2021 12:54:13 -0400 Subject: [PATCH] Fix Dark Matter Focus bug closes #71 --- .../common/entities/EntityDarkMatter.java | 9 +++++---- .../common/entities/EntityDiffusion.java | 17 ++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/taintedmagic/common/entities/EntityDarkMatter.java b/src/main/java/taintedmagic/common/entities/EntityDarkMatter.java index 33a06cf..4f26812 100644 --- a/src/main/java/taintedmagic/common/entities/EntityDarkMatter.java +++ b/src/main/java/taintedmagic/common/entities/EntityDarkMatter.java @@ -2,6 +2,7 @@ package taintedmagic.common.entities; import java.util.List; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -37,12 +38,12 @@ public class EntityDarkMatter extends EntityEldritchOrb { protected void onImpact (final MovingObjectPosition mop) { if (!worldObj.isRemote && getThrower() != null) { final double expand = 1.5D + enlarge * 0.5D; - System.out.println(expand); - final List list = + final List entities = worldObj.getEntitiesWithinAABBExcludingEntity(getThrower(), boundingBox.expand(expand, expand, expand)); - for (final EntityLivingBase entity : list) { - if (mop.entityHit != null) { + for (final Entity e : entities) { + if (e instanceof EntityLivingBase) { + final EntityLivingBase entity = (EntityLivingBase) e; entity.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, getThrower()), dmg); if (corrosive) { entity.addPotionEffect(new PotionEffect(Potion.wither.id, 160, 1)); diff --git a/src/main/java/taintedmagic/common/entities/EntityDiffusion.java b/src/main/java/taintedmagic/common/entities/EntityDiffusion.java index 29b5343..7584f63 100644 --- a/src/main/java/taintedmagic/common/entities/EntityDiffusion.java +++ b/src/main/java/taintedmagic/common/entities/EntityDiffusion.java @@ -95,16 +95,19 @@ public class EntityDiffusion extends EntityThrowable { @Override protected void onImpact (final MovingObjectPosition mop) { if (!worldObj.isRemote && getThrower() != null) { - final List entities = + final List entities = worldObj.getEntitiesWithinAABBExcludingEntity(getThrower(), boundingBox.expand(1.0D, 1.0D, 1.0D)); - for (final EntityLivingBase entity : entities) { - if (mop.entityHit != null) { - entity.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, getThrower()), dmg); - if (corrosive) { - entity.addPotionEffect(new PotionEffect(Potion.wither.id, 40, 1)); + for (final Entity e : entities) { + if (e instanceof EntityLivingBase) { + final EntityLivingBase entity = (EntityLivingBase) e; + if (mop.entityHit != null) { + entity.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, getThrower()), dmg); + if (corrosive) { + entity.addPotionEffect(new PotionEffect(Potion.wither.id, 40, 1)); + } + entity.addPotionEffect(new PotionEffect(Potion.weakness.id, 40, 1)); } - entity.addPotionEffect(new PotionEffect(Potion.weakness.id, 40, 1)); } } worldObj.setEntityState(this, (byte) 16);