Update changes.md, include magic projectiles in projectile event

iron431 · Jun 23, 2023 · 8fd7144 · 8fd7144
1 parent af536d5
commit 8fd7144
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/main/java/io/redspace/ironsspellbooks/entity/spells/AbstractMagicProjectile.java b/src/main/java/io/redspace/ironsspellbooks/entity/spells/AbstractMagicProjectile.java
@@ -73,7 +73,7 @@ public void tick() {
 
         }
         HitResult hitresult = ProjectileUtil.getHitResult(this, this::canHitEntity);
-        if (hitresult.getType() != HitResult.Type.MISS) {
+        if (hitresult.getType() != HitResult.Type.MISS && !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) {
             onHit(hitresult);
         }
         setPos(position().add(getDeltaMovement()));

diff --git a/src/main/java/io/redspace/ironsspellbooks/entity/spells/fireball/MagicFireball.java b/src/main/java/io/redspace/ironsspellbooks/entity/spells/fireball/MagicFireball.java
@@ -1,14 +1,12 @@
 package io.redspace.ironsspellbooks.entity.spells.fireball;
 
-import io.redspace.ironsspellbooks.capabilities.magic.MagicManager;
 import io.redspace.ironsspellbooks.damage.DamageSources;
 import io.redspace.ironsspellbooks.entity.spells.AbstractMagicProjectile;
 import io.redspace.ironsspellbooks.registries.EntityRegistry;
 import io.redspace.ironsspellbooks.spells.SchoolType;
 import io.redspace.ironsspellbooks.spells.SpellType;
 import io.redspace.ironsspellbooks.util.ParticleHelper;
 import io.redspace.ironsspellbooks.util.Utils;
-import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.Entity;
@@ -50,7 +48,6 @@ public void trailParticles() {
 
     @Override
     public void impactParticles(double x, double y, double z) {
-        MagicManager.spawnParticles(level, ParticleTypes.LAVA, x, y, z, 50, .1, .1, .1, 0.5 * getExplosionRadius(), false);
     }
 
     @Override