From a8e5c50e9b0b6e136a65d9ea5c49b2dbd0815cb6 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 29 May 2023 12:27:43 +0100
Subject: [PATCH] Fixed catapult spell constantly refiring when cast using the
 regular cast spell ability instead of shoot spell

---
 .../unicopia/ability/magic/spell/effect/CatapultSpell.java     | 3 ++-
 .../ability/magic/spell/effect/ChillingBreathSpell.java        | 2 +-
 .../unicopia/projectile/MagicProjectileEntity.java             | 2 +-
 3 files changed, 4 insertions(+), 3 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 f00d9020..c6426c6d 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
@@ -59,7 +59,8 @@ public class CatapultSpell extends AbstractSpell implements ProjectileDelegate.B
         }
 
         getTypeAndTraits().create().toThrowable().throwProjectile(caster);
-        return false;
+        setDead();
+        return isDead();
     }
 
     protected void apply(Caster<?> caster, Entity e) {
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/ChillingBreathSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/ChillingBreathSpell.java
index 861167eb..18965bd4 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/ChillingBreathSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/ChillingBreathSpell.java
@@ -23,7 +23,7 @@ public class ChillingBreathSpell extends AbstractSpell implements HomingSpell {
         if (!source.subtractEnergyCost(90)) {
             setDead();
         }
-        return false;
+        return !isDead();
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
index c7509c76..2b6d370a 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
@@ -170,7 +170,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     @Override
     public void tick() {
         if (!world.isClient() && !homingTarget.isPresent(world)) {
-            if (getVelocity().length() < 0.01) {
+            if (getVelocity().length() < 0.1 || age > 90) {
                 discard();
             }
         }