From 4b820478f5ca3bc3e7ce39fa9451aba74c1cfd42 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 6 Jan 2022 15:31:33 +0200
Subject: [PATCH] Set spells to be no gravity by default (so it's easier to
 aim)

---
 .../ability/magic/spell/ThrowableSpell.java      |  1 +
 .../projectile/MagicProjectileEntity.java        | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java
index d9ffb274..9221c471 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java
@@ -66,6 +66,7 @@ public final class ThrowableSpell extends AbstractDelegatingSpell {
             projectile.getSpellSlot().put(this);
             projectile.setVelocity(entity, entity.getPitch(), entity.getYaw(), 0, 1.5F, divergance);
             projectile.setHydrophobic();
+            projectile.setNoGravity(true);
             configureProjectile(projectile, caster);
             world.spawnEntity(projectile);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
index a0792595..708b2db4 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
@@ -9,6 +9,7 @@ import com.minelittlepony.unicopia.ability.magic.Affine;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Levelled;
 import com.minelittlepony.unicopia.ability.magic.SpellContainer;
+import com.minelittlepony.unicopia.ability.magic.SpellContainer.Operation;
 import com.minelittlepony.unicopia.ability.magic.SpellPredicate;
 import com.minelittlepony.unicopia.ability.magic.spell.Situation;
 import com.minelittlepony.unicopia.ability.magic.spell.Spell;
@@ -56,6 +57,8 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Li
     private static final TrackedData<NbtCompound> EFFECT = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.TAG_COMPOUND);
     private static final LevelStore LEVELS = Levelled.fixed(1);
 
+    public static final byte PROJECTILE_COLLISSION = 3;
+
     private final EffectSync effectDelegate = new EffectSync(this, EFFECT);
 
     private final EntityPhysics<MagicProjectileEntity> physics = new EntityPhysics<>(this, GRAVITY, false);
@@ -208,12 +211,14 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Li
 
     @Override
     public void handleStatus(byte id) {
-       if (id == 3) {
+       if (id == PROJECTILE_COLLISSION) {
           ParticleEffect effect = getParticleParameters();
 
           for(int i = 0; i < 8; i++) {
              world.addParticle(effect, getX(), getY(), getZ(), 0, 0, 0);
           }
+       } else {
+           super.handleStatus(id);
        }
     }
 
@@ -244,7 +249,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Li
             super.onCollision(result);
 
             if (!world.isClient()) {
-                world.sendEntityStatus(this, (byte)3);
+                world.sendEntityStatus(this, PROJECTILE_COLLISSION);
                 discard();
             }
         }
@@ -277,7 +282,12 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Li
     }
 
     protected void forEachDelegates(Consumer<ProjectileDelegate> consumer) {
-        getSpellSlot().get(SpellPredicate.HAS_PROJECTILE_EVENTS, true).ifPresent(consumer);
+        getSpellSlot().forEach(spell -> {
+            if (SpellPredicate.HAS_PROJECTILE_EVENTS.test(spell)) {
+                consumer.accept((ProjectileDelegate)spell);
+            }
+            return Operation.SKIP;
+        }, true);
         if (getItem().getItem() instanceof ProjectileDelegate) {
             consumer.accept(((ProjectileDelegate)getItem().getItem()));
         }