From 827c91c726476e248368a53fead5b82c2d1e86b7 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Mon, 9 Sep 2024 19:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/projectile/JavelinMissileEntity.java | 4 ++-- .../net/mcreator/superbwarfare/tools/ProjectileTool.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/entity/projectile/JavelinMissileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/projectile/JavelinMissileEntity.java index 44c0cc208..2c470c104 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/projectile/JavelinMissileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/projectile/JavelinMissileEntity.java @@ -150,7 +150,7 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo if (this.tickCount > 1) { if (this.level() instanceof ServerLevel) { - ProjectileTool.causeCustomExplode(this, 8.0f, this.monsterMultiplier); + ProjectileTool.causeCustomExplode(this, this.damage, 8.0f, this.monsterMultiplier); } } @@ -201,7 +201,7 @@ public class JavelinMissileEntity extends ThrowableItemProjectile implements Geo if (this.tickCount > 200 || this.isInWater()) { if (this.level() instanceof ServerLevel) { - ProjectileTool.causeCustomExplode(this, 8.0f, this.monsterMultiplier); + ProjectileTool.causeCustomExplode(this, this.damage, 8.0f, this.monsterMultiplier); } this.discard(); } diff --git a/src/main/java/net/mcreator/superbwarfare/tools/ProjectileTool.java b/src/main/java/net/mcreator/superbwarfare/tools/ProjectileTool.java index 43a8b2da7..38a86aaf8 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/ProjectileTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/ProjectileTool.java @@ -10,7 +10,7 @@ import javax.annotation.Nullable; public class ProjectileTool { - public static void causeCustomExplode(ThrowableItemProjectile projectile, Entity target, float radius, float damage, float damageMultiplier) { + public static void causeCustomExplode(ThrowableItemProjectile projectile, Entity target, float damage, float radius, float damageMultiplier) { CustomExplosion explosion = new CustomExplosion(projectile.level(), projectile, ModDamageTypes.causeProjectileBoomDamage(projectile.level().registryAccess(), projectile, projectile.getOwner()), damage, target.getX(), target.getY(), target.getZ(), radius, Explosion.BlockInteraction.KEEP).setDamageMultiplier(damageMultiplier); @@ -21,15 +21,15 @@ public class ProjectileTool { projectile.discard(); } - public static void causeCustomExplode(ThrowableItemProjectile projectile, float radius, float damage, float damageMultiplier) { + public static void causeCustomExplode(ThrowableItemProjectile projectile, float damage, float radius, float damageMultiplier) { causeCustomExplode(projectile, projectile, damage, radius, damageMultiplier); } public static void causeCustomExplode(ThrowableItemProjectile projectile, float damage, float radius) { - causeCustomExplode(projectile, radius, damage, 0.0f); + causeCustomExplode(projectile, damage, radius, 0.0f); } - public static void causeCustomExplode(LivingEntity projectile, @Nullable LivingEntity owner, float radius, float damage, float damageMultiplier) { + public static void causeCustomExplode(LivingEntity projectile, @Nullable LivingEntity owner, float damage, float radius, float damageMultiplier) { CustomExplosion explosion = new CustomExplosion(projectile.level(), projectile, ModDamageTypes.causeProjectileBoomDamage(projectile.level().registryAccess(), projectile, owner), damage, projectile.getX(), projectile.getY(), projectile.getZ(), radius, Explosion.BlockInteraction.KEEP).setDamageMultiplier(damageMultiplier);