From b9fa4b072dd34e7924a695f87c0130dcfc92b02d Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 1 Mar 2021 15:09:17 +0200 Subject: [PATCH] Fix some issues with spells --- .../ability/magic/spell/AttractiveSpell.java | 2 +- .../unicopia/ability/magic/spell/AwkwardSpell.java | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AttractiveSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AttractiveSpell.java index 1a67e747..3dbbcf28 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AttractiveSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AttractiveSpell.java @@ -59,7 +59,7 @@ public class AttractiveSpell extends ShieldSpell implements Thrown { protected void applyRadialEffect(Caster source, Entity target, double distance, double radius) { Vec3d pos = homingPos == null ? source.getOriginVector() : Vec3d.of(homingPos); - double force = 2.5F / distance; + double force = 2.5F * distance; if (source.getAffinity() != Affinity.BAD && target instanceof PlayerEntity) { force *= calculateAdjustedForce(Pony.of((PlayerEntity)target)); diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AwkwardSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AwkwardSpell.java index e2e31a5b..570b2a30 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AwkwardSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AwkwardSpell.java @@ -6,8 +6,6 @@ import java.util.List; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.Thrown; import com.minelittlepony.unicopia.util.shape.Sphere; -import com.mojang.brigadier.StringReader; -import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleType; @@ -36,15 +34,11 @@ public class AwkwardSpell extends AbstractSpell implements Thrown { int index = (int)MathHelper.nextDouble(source.getWorld().random, 0, names.size()); - @SuppressWarnings("unchecked") - ParticleType type = (ParticleType)Registry.PARTICLE_TYPE.get(names.get(index)); + Identifier id = names.get(index); + ParticleType type = Registry.PARTICLE_TYPE.get(id); - if (shouldSpawnParticle(type)) { - try { - source.addParticle(type.getParametersFactory().read(type, new StringReader("0 0 0")), pos, Vec3d.ZERO); - } catch (CommandSyntaxException e) { - e.printStackTrace(); - } + if (type instanceof ParticleEffect && shouldSpawnParticle(type)) { + source.addParticle((ParticleEffect)type, pos, Vec3d.ZERO); } }); }