From e3bd201f0a71e759eb6d0b9606d41a62f8f3b3fe Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 22 Dec 2021 15:05:46 +0200 Subject: [PATCH] Fix the firebolt spell --- .../unicopia/ability/magic/spell/effect/CatapultSpell.java | 2 +- .../unicopia/ability/magic/spell/effect/FireBoltSpell.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java index d61c7aa8..afbd5679 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java @@ -61,7 +61,7 @@ public class CatapultSpell extends AbstractSpell implements ProjectileSpell { } getTarget(caster, e -> apply(caster, e)); - return situation == Situation.PROJECTILE; + return false; } protected void apply(Caster caster, Entity e) { diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java index ea12039c..68597d28 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java @@ -23,11 +23,14 @@ public class FireBoltSpell extends AbstractSpell implements ProjectileSpell { @Override public boolean tick(Caster caster, Situation situation) { + if (situation == Situation.PROJECTILE) { + return true; + } + for (int i = 0; i < getNumberOfBalls(caster); i++) { getType().create(getTraits()).toThrowable().throwProjectile(caster); caster.playSound(SoundEvents.ENTITY_BLAZE_SHOOT, 0.7F, 0.4F / (caster.getWorld().random.nextFloat() * 0.4F + 0.8F)); } - return false; } @@ -35,6 +38,7 @@ public class FireBoltSpell extends AbstractSpell implements ProjectileSpell { public void configureProjectile(MagicProjectileEntity projectile, Caster caster) { projectile.setItem(Items.FIRE_CHARGE.getDefaultStack()); projectile.addThrowDamage(9); + projectile.setFireTicks(900000); projectile.setVelocity(projectile.getVelocity().multiply(1.3)); }