From e5e63f80b0a5ac1b0a510b8d3373e53c4c1bb85f Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Thu, 26 Sep 2024 11:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BF=E9=80=8F=E5=88=A4?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/projectile/ProjectileEntity.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java index 9a87ca885..b08572f38 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java @@ -258,22 +258,22 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa entityResults.sort(Comparator.comparingDouble(e -> e.getHitPos().distanceTo(this.shooter.position()))); for (EntityResult entityResult : entityResults) { - if (!this.beast) { - this.bypassArmorRate -= 0.2F; - if (this.bypassArmorRate < 0) { - break; - } - } - result = new ExtendedEntityRayTraceResult(entityResult); if (((EntityHitResult) result).getEntity() instanceof Player player) { - if (this.shooter instanceof Player && !((Player) this.shooter).canHarmPlayer(player)) { + if (this.shooter instanceof Player p && !p.canHarmPlayer(player)) { result = null; } } if (result != null) { this.onHit(result); } + + if (!this.beast) { + this.bypassArmorRate -= 0.2F; + if (this.bypassArmorRate < 0.8F) { + break; + } + } } if (entityResults.isEmpty()) { this.onHit(result);