diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityBlizzard.java b/src/main/java/electroblob/wizardry/entity/construct/EntityBlizzard.java index 28c3b63b..e32f38b8 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityBlizzard.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityBlizzard.java @@ -38,7 +38,7 @@ public class EntityBlizzard extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(radius, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(radius, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityCombustionRune.java b/src/main/java/electroblob/wizardry/entity/construct/EntityCombustionRune.java index 60132203..68205f57 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityCombustionRune.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityCombustionRune.java @@ -25,7 +25,7 @@ public class EntityCombustionRune extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(width/2, posX, posY, posZ, world); + List targets = EntityUtils.getLivingWithinRadius(width/2, posX, posY, posZ, world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityDecay.java b/src/main/java/electroblob/wizardry/entity/construct/EntityDecay.java index 492a3fc7..98fe3839 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityDecay.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityDecay.java @@ -36,7 +36,7 @@ public class EntityDecay extends EntityMagicConstruct { 0.6F + rand.nextFloat() * 0.15F); if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(1.0d, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(1.0d, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ if(target != this.getCaster()){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityEarthquake.java b/src/main/java/electroblob/wizardry/entity/construct/EntityEarthquake.java index 1c91640d..0e6c4426 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityEarthquake.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityEarthquake.java @@ -63,7 +63,7 @@ public class EntityEarthquake extends EntityMagicConstruct { } List targets = EntityUtils - .getEntitiesWithinRadius((this.ticksExisted * speed) + 1.5, this.posX, this.posY, this.posZ, world); + .getLivingWithinRadius((this.ticksExisted * speed) + 1.5, this.posX, this.posY, this.posZ, world); // In this particular instance, the caster is completely unaffected because they will always be in the // centre. diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityFireRing.java b/src/main/java/electroblob/wizardry/entity/construct/EntityFireRing.java index 13068287..de2f7134 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityFireRing.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityFireRing.java @@ -32,7 +32,7 @@ public class EntityFireRing extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(2.5d, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(2.5d, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityFireSigil.java b/src/main/java/electroblob/wizardry/entity/construct/EntityFireSigil.java index ff3c9aa3..87a624af 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityFireSigil.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityFireSigil.java @@ -29,7 +29,7 @@ public class EntityFireSigil extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(width/2, posX, posY, posZ, world); + List targets = EntityUtils.getLivingWithinRadius(width/2, posX, posY, posZ, world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityFrostSigil.java b/src/main/java/electroblob/wizardry/entity/construct/EntityFrostSigil.java index 8ae8ebfc..a32cb98b 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityFrostSigil.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityFrostSigil.java @@ -32,7 +32,7 @@ public class EntityFrostSigil extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(1.0d, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(1.0d, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityHammer.java b/src/main/java/electroblob/wizardry/entity/construct/EntityHammer.java index 28c0644c..7a0734ac 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityHammer.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityHammer.java @@ -105,7 +105,7 @@ public class EntityHammer extends EntityMagicConstruct { double seekerRange = Spells.lightning_hammer.getProperty(Spell.EFFECT_RADIUS).doubleValue(); - List targets = EntityUtils.getEntitiesWithinRadius(seekerRange, this.posX, + List targets = EntityUtils.getLivingWithinRadius(seekerRange, this.posX, this.posY + 1, this.posZ, world); int maxTargets = Spells.lightning_hammer.getProperty(LightningHammer.SECONDARY_MAX_TARGETS).intValue(); diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityHealAura.java b/src/main/java/electroblob/wizardry/entity/construct/EntityHealAura.java index 33afab60..0901896d 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityHealAura.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityHealAura.java @@ -36,7 +36,7 @@ public class EntityHealAura extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(2.5, posX, posY, posZ, world); + List targets = EntityUtils.getLivingWithinRadius(2.5, posX, posY, posZ, world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityLightningSigil.java b/src/main/java/electroblob/wizardry/entity/construct/EntityLightningSigil.java index f2350bc6..f8159198 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityLightningSigil.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityLightningSigil.java @@ -34,7 +34,7 @@ public class EntityLightningSigil extends EntityMagicConstruct { this.setDead(); } - List targets = EntityUtils.getEntitiesWithinRadius(1.0d, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(1.0d, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ @@ -60,7 +60,7 @@ public class EntityLightningSigil extends EntityMagicConstruct { // Secondary chaining effect double seekerRange = Spells.lightning_sigil.getProperty(Spell.EFFECT_RADIUS).doubleValue(); - List secondaryTargets = EntityUtils.getEntitiesWithinRadius(seekerRange, + List secondaryTargets = EntityUtils.getLivingWithinRadius(seekerRange, target.posX, target.posY + target.height / 2, target.posZ, world); for(int j = 0; j < Math.min(secondaryTargets.size(), diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java b/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java index 29254c77..f150e52c 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java @@ -72,7 +72,7 @@ public class EntityTornado extends EntityMagicConstruct { if(!this.world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(radius, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(radius, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityFirebomb.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityFirebomb.java index d42a04f3..d380ba84 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityFirebomb.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityFirebomb.java @@ -69,7 +69,7 @@ public class EntityFirebomb extends EntityBomb { double range = Spells.firebomb.getProperty(Spell.BLAST_RADIUS).floatValue() * blastMultiplier; - List targets = EntityUtils.getEntitiesWithinRadius(range, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(range, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityForceOrb.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityForceOrb.java index 424b2fba..8db9243a 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityForceOrb.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityForceOrb.java @@ -53,7 +53,7 @@ public class EntityForceOrb extends EntityBomb { double blastRadius = Spells.force_orb.getProperty(Spell.BLAST_RADIUS).floatValue() * blastMultiplier; - List targets = EntityUtils.getEntitiesWithinRadius(blastRadius, this.posX, + List targets = EntityUtils.getLivingWithinRadius(blastRadius, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityIceCharge.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityIceCharge.java index 6c6bcb01..2bfc3598 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityIceCharge.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityIceCharge.java @@ -72,7 +72,7 @@ public class EntityIceCharge extends EntityBomb { double radius = Spells.ice_charge.getProperty(Spell.EFFECT_RADIUS).floatValue() * blastMultiplier; - List targets = EntityUtils.getEntitiesWithinRadius(radius, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(radius, this.posX, this.posY, this.posZ, this.world); // Slows targets diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityPoisonBomb.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityPoisonBomb.java index e2bbb739..83ffbb9e 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityPoisonBomb.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityPoisonBomb.java @@ -74,7 +74,7 @@ public class EntityPoisonBomb extends EntityBomb { double range = Spells.poison_bomb.getProperty(Spell.EFFECT_RADIUS).floatValue() * blastMultiplier; - List targets = EntityUtils.getEntitiesWithinRadius(range, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(range, this.posX, this.posY, this.posZ, this.world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntitySmokeBomb.java b/src/main/java/electroblob/wizardry/entity/projectile/EntitySmokeBomb.java index f19e6453..1e6ed29f 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntitySmokeBomb.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntitySmokeBomb.java @@ -55,7 +55,7 @@ public class EntitySmokeBomb extends EntityBomb { double range = Spells.smoke_bomb.getProperty(Spell.BLAST_RADIUS).floatValue() * blastMultiplier; - List targets = EntityUtils.getEntitiesWithinRadius(range, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(range, this.posX, this.posY, this.posZ, this.world); int duration = Spells.smoke_bomb.getProperty(Spell.EFFECT_DURATION).intValue(); diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntitySparkBomb.java b/src/main/java/electroblob/wizardry/entity/projectile/EntitySparkBomb.java index 93c9d14a..53e0e145 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntitySparkBomb.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntitySparkBomb.java @@ -55,7 +55,7 @@ public class EntitySparkBomb extends EntityBomb { double seekerRange = Spells.spark_bomb.getProperty(Spell.EFFECT_RADIUS).doubleValue() * blastMultiplier; - List targets = EntityUtils.getEntitiesWithinRadius(seekerRange, this.posX, this.posY, + List targets = EntityUtils.getLivingWithinRadius(seekerRange, this.posX, this.posY, this.posZ, this.world); for(int i = 0; i < Math.min(targets.size(), Spells.spark_bomb.getProperty(SECONDARY_MAX_TARGETS).intValue()); i++){ diff --git a/src/main/java/electroblob/wizardry/item/ItemArtefact.java b/src/main/java/electroblob/wizardry/item/ItemArtefact.java index 1579c8c3..915c42c1 100644 --- a/src/main/java/electroblob/wizardry/item/ItemArtefact.java +++ b/src/main/java/electroblob/wizardry/item/ItemArtefact.java @@ -480,7 +480,7 @@ public class ItemArtefact extends Item { // Spell properties allow all three of the above spells to be dealt with the same way - neat! float healthGained = event.getSpell().getProperty(Spell.HEALTH).floatValue() * event.getModifiers().get(SpellModifiers.POTENCY); - List nearby = EntityUtils.getEntitiesWithinRadius(4, player.posX, player.posY, player.posZ, event.getWorld()); + List nearby = EntityUtils.getLivingWithinRadius(4, player.posX, player.posY, player.posZ, event.getWorld()); for(EntityLivingBase entity : nearby){ if(AllyDesignationSystem.isAllied(player, entity) && entity.getHealth() > 0 && entity.getHealth() < entity.getMaxHealth()){ @@ -656,7 +656,7 @@ public class ItemArtefact extends Item { if(EntityUtils.isMeleeDamage(event.getSource()) && mainhandItem.getItem() instanceof ItemWand && ((ItemWand)mainhandItem.getItem()).element == Element.LIGHTNING){ - EntityUtils.getEntitiesWithinRadius(3, player.posX, player.posY, player.posZ, world).stream() + EntityUtils.getLivingWithinRadius(3, player.posX, player.posY, player.posZ, world).stream() .filter(EntityUtils::isLiving) .filter(e -> e != player) .min(Comparator.comparingDouble(player::getDistanceSq)) diff --git a/src/main/java/electroblob/wizardry/item/ItemLightningHammer.java b/src/main/java/electroblob/wizardry/item/ItemLightningHammer.java index 9209799c..6ae8b69c 100644 --- a/src/main/java/electroblob/wizardry/item/ItemLightningHammer.java +++ b/src/main/java/electroblob/wizardry/item/ItemLightningHammer.java @@ -195,7 +195,7 @@ public class ItemLightningHammer extends Item implements IConjuredItem { if(attackStrength == 1){ // Only chains when the attack meter is full - List nearby = EntityUtils.getEntitiesWithinRadius(CHAINING_RANGE, hit.posX, hit.posY, hit.posZ, hit.world); + List nearby = EntityUtils.getLivingWithinRadius(CHAINING_RANGE, hit.posX, hit.posY, hit.posZ, hit.world); nearby.remove(hit); nearby.remove(wielder); diff --git a/src/main/java/electroblob/wizardry/spell/ChainLightning.java b/src/main/java/electroblob/wizardry/spell/ChainLightning.java index fe0fcfb0..045f33b0 100644 --- a/src/main/java/electroblob/wizardry/spell/ChainLightning.java +++ b/src/main/java/electroblob/wizardry/spell/ChainLightning.java @@ -46,7 +46,7 @@ public class ChainLightning extends SpellRay { * modifiers.get(SpellModifiers.POTENCY)); // Secondary chaining effect - List secondaryTargets = EntityUtils.getEntitiesWithinRadius( + List secondaryTargets = EntityUtils.getLivingWithinRadius( getProperty(SECONDARY_RANGE).doubleValue(), target.posX, target.posY + target.height / 2, target.posZ, world); secondaryTargets.remove(target); @@ -62,7 +62,7 @@ public class ChainLightning extends SpellRay { // Tertiary chaining effect - List tertiaryTargets = EntityUtils.getEntitiesWithinRadius( + List tertiaryTargets = EntityUtils.getLivingWithinRadius( getProperty(TERTIARY_RANGE).doubleValue(), secondaryTarget.posX, secondaryTarget.posY + secondaryTarget.height / 2, secondaryTarget.posZ, world); diff --git a/src/main/java/electroblob/wizardry/spell/Detonate.java b/src/main/java/electroblob/wizardry/spell/Detonate.java index da18c03b..aa1ea8ea 100644 --- a/src/main/java/electroblob/wizardry/spell/Detonate.java +++ b/src/main/java/electroblob/wizardry/spell/Detonate.java @@ -38,7 +38,7 @@ public class Detonate extends SpellRay { if(!world.isRemote){ - List targets = EntityUtils.getEntitiesWithinRadius(getProperty(BLAST_RADIUS).doubleValue() + List targets = EntityUtils.getLivingWithinRadius(getProperty(BLAST_RADIUS).doubleValue() * modifiers.get(WizardryItems.blast_upgrade), pos.getX(), pos.getY(), pos.getZ(), world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/spell/GroupHeal.java b/src/main/java/electroblob/wizardry/spell/GroupHeal.java index ae8abef8..3c498ca4 100644 --- a/src/main/java/electroblob/wizardry/spell/GroupHeal.java +++ b/src/main/java/electroblob/wizardry/spell/GroupHeal.java @@ -23,7 +23,7 @@ public class GroupHeal extends Spell { boolean flag = false; - List targets = EntityUtils.getEntitiesWithinRadius(getProperty(EFFECT_RADIUS).floatValue() + List targets = EntityUtils.getLivingWithinRadius(getProperty(EFFECT_RADIUS).floatValue() * modifiers.get(WizardryItems.blast_upgrade), caster.posX, caster.posY, caster.posZ, world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/spell/IceAge.java b/src/main/java/electroblob/wizardry/spell/IceAge.java index c9498bf0..4d40da67 100644 --- a/src/main/java/electroblob/wizardry/spell/IceAge.java +++ b/src/main/java/electroblob/wizardry/spell/IceAge.java @@ -39,7 +39,7 @@ public class IceAge extends Spell { float radius = getProperty(EFFECT_RADIUS).floatValue() * modifiers.get(WizardryItems.blast_upgrade); - List targets = EntityUtils.getEntitiesWithinRadius(radius, caster.posX, caster.posY, caster.posZ, world); + List targets = EntityUtils.getLivingWithinRadius(radius, caster.posX, caster.posY, caster.posZ, world); for(EntityLivingBase target : targets){ if(AllyDesignationSystem.isValidTarget(caster, target)){ diff --git a/src/main/java/electroblob/wizardry/spell/LightningPulse.java b/src/main/java/electroblob/wizardry/spell/LightningPulse.java index ed72903b..0e84131a 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningPulse.java +++ b/src/main/java/electroblob/wizardry/spell/LightningPulse.java @@ -38,7 +38,7 @@ public class LightningPulse extends Spell { if(caster.onGround){ - List targets = EntityUtils.getEntitiesWithinRadius( + List targets = EntityUtils.getLivingWithinRadius( getProperty(EFFECT_RADIUS).floatValue() * modifiers.get(WizardryItems.blast_upgrade), caster.posX, caster.posY, caster.posZ, world); diff --git a/src/main/java/electroblob/wizardry/spell/LightningWeb.java b/src/main/java/electroblob/wizardry/spell/LightningWeb.java index c0b95f70..d0d14e49 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningWeb.java +++ b/src/main/java/electroblob/wizardry/spell/LightningWeb.java @@ -60,7 +60,7 @@ public class LightningWeb extends SpellRay { // Secondary chaining effect - List secondaryTargets = EntityUtils.getEntitiesWithinRadius( + List secondaryTargets = EntityUtils.getLivingWithinRadius( getProperty(SECONDARY_RANGE).floatValue(), target.posX, target.posY + target.height / 2, target.posZ, world); @@ -77,7 +77,7 @@ public class LightningWeb extends SpellRay { // Tertiary chaining effect - List tertiaryTargets = EntityUtils.getEntitiesWithinRadius( + List tertiaryTargets = EntityUtils.getLivingWithinRadius( getProperty(TERTIARY_RANGE).floatValue(), secondaryTarget.posX, secondaryTarget.posY + secondaryTarget.height / 2, secondaryTarget.posZ, world); diff --git a/src/main/java/electroblob/wizardry/spell/MindControl.java b/src/main/java/electroblob/wizardry/spell/MindControl.java index c658bc63..6c81055c 100644 --- a/src/main/java/electroblob/wizardry/spell/MindControl.java +++ b/src/main/java/electroblob/wizardry/spell/MindControl.java @@ -132,7 +132,7 @@ public class MindControl extends SpellRay { // As of 1.1, this now uses the creature's follow range, like normal targeting. It also // no longer lasts until the creature dies; instead it is a potion effect which continues to // set the target until it wears off. - List possibleTargets = EntityUtils.getEntitiesWithinRadius( + List possibleTargets = EntityUtils.getLivingWithinRadius( target.getEntityAttribute(SharedMonsterAttributes.FOLLOW_RANGE).getAttributeValue(), target.posX, target.posY, target.posZ, world); diff --git a/src/main/java/electroblob/wizardry/spell/PlagueOfDarkness.java b/src/main/java/electroblob/wizardry/spell/PlagueOfDarkness.java index afcb36d2..8d3bef3f 100644 --- a/src/main/java/electroblob/wizardry/spell/PlagueOfDarkness.java +++ b/src/main/java/electroblob/wizardry/spell/PlagueOfDarkness.java @@ -30,7 +30,7 @@ public class PlagueOfDarkness extends Spell { double radius = getProperty(EFFECT_RADIUS).floatValue() * modifiers.get(WizardryItems.blast_upgrade); - List targets = EntityUtils.getEntitiesWithinRadius(radius, caster.posX, caster.posY, caster.posZ, world); + List targets = EntityUtils.getLivingWithinRadius(radius, caster.posX, caster.posY, caster.posZ, world); for(EntityLivingBase target : targets){ if(AllyDesignationSystem.isValidTarget(caster, target) @@ -75,8 +75,7 @@ public class PlagueOfDarkness extends Spell { .clr(0.8f, 0, 0.05f) .spawn(world); } - - caster.swingArm(hand); + this.playSound(world, caster, ticksInUse, -1, modifiers); return true; } diff --git a/src/main/java/electroblob/wizardry/spell/Shockwave.java b/src/main/java/electroblob/wizardry/spell/Shockwave.java index 9398b7b1..4ddc08f4 100644 --- a/src/main/java/electroblob/wizardry/spell/Shockwave.java +++ b/src/main/java/electroblob/wizardry/spell/Shockwave.java @@ -37,7 +37,7 @@ public class Shockwave extends Spell { double radius = getProperty(BLAST_RADIUS).floatValue() * modifiers.get(WizardryItems.blast_upgrade); - List targets = EntityUtils.getEntitiesWithinRadius(radius, caster.posX, caster.posY, caster.posZ, world); + List targets = EntityUtils.getLivingWithinRadius(radius, caster.posX, caster.posY, caster.posZ, world); for(EntityLivingBase target : targets){ diff --git a/src/main/java/electroblob/wizardry/spell/ShulkerBullet.java b/src/main/java/electroblob/wizardry/spell/ShulkerBullet.java index 167623c3..1eb275c0 100644 --- a/src/main/java/electroblob/wizardry/spell/ShulkerBullet.java +++ b/src/main/java/electroblob/wizardry/spell/ShulkerBullet.java @@ -62,7 +62,7 @@ public class ShulkerBullet extends Spell { double range = getProperty(RANGE).floatValue() * modifiers.get(WizardryItems.range_upgrade); - List possibleTargets = EntityUtils.getEntitiesWithinRadius(range, x, y, z, world); + List possibleTargets = EntityUtils.getLivingWithinRadius(range, x, y, z, world); possibleTargets.remove(caster); possibleTargets.removeIf(t -> t instanceof EntityArmorStand); diff --git a/src/main/java/electroblob/wizardry/spell/Thunderstorm.java b/src/main/java/electroblob/wizardry/spell/Thunderstorm.java index 9c0314dc..b48d3a25 100644 --- a/src/main/java/electroblob/wizardry/spell/Thunderstorm.java +++ b/src/main/java/electroblob/wizardry/spell/Thunderstorm.java @@ -77,7 +77,7 @@ public class Thunderstorm extends Spell { // entityNBT.setInteger("summoningPlayer", entityplayer.entityId); // Secondary chaining effect - List secondaryTargets = EntityUtils.getEntitiesWithinRadius( + List secondaryTargets = EntityUtils.getLivingWithinRadius( getProperty(SECONDARY_RANGE).doubleValue(), x, y + 1, z, world); for(int j = 0; j < Math.min(secondaryTargets.size(), getProperty(SECONDARY_MAX_TARGETS).intValue()); j++){ @@ -102,7 +102,7 @@ public class Thunderstorm extends Spell { // Tertiary chaining effect - List tertiaryTargets = EntityUtils.getEntitiesWithinRadius( + List tertiaryTargets = EntityUtils.getLivingWithinRadius( getProperty(TERTIARY_RANGE).doubleValue(), secondaryTarget.posX, secondaryTarget.posY + secondaryTarget.height / 2, secondaryTarget.posZ, world); diff --git a/src/main/java/electroblob/wizardry/util/EntityUtils.java b/src/main/java/electroblob/wizardry/util/EntityUtils.java index 5f1e1e61..4bcb5928 100644 --- a/src/main/java/electroblob/wizardry/util/EntityUtils.java +++ b/src/main/java/electroblob/wizardry/util/EntityUtils.java @@ -79,7 +79,7 @@ public final class EntityUtils { * @param z The z coordinate to search around * @param world The world to search in */ - public static List getEntitiesWithinRadius(double radius, double x, double y, double z, World world){ + public static List getLivingWithinRadius(double radius, double x, double y, double z, World world){ return getEntitiesWithinRadius(radius, x, y, z, world, EntityLivingBase.class); } @@ -89,7 +89,7 @@ public final class EntityUtils { * this does not exclude any entities; if any specific entities are to be excluded this must be checked when * iterating through the list. * - * @see EntityUtils#getEntitiesWithinRadius(double, double, double, double, World) + * @see EntityUtils#getLivingWithinRadius(double, double, double, double, World) * @param radius The search radius * @param x The x coordinate to search around * @param y The y coordinate to search around