修改穿透判定
This commit is contained in:
parent
b09de2873f
commit
e5e63f80b0
1 changed files with 8 additions and 8 deletions
|
@ -258,22 +258,22 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
|
||||||
entityResults.sort(Comparator.comparingDouble(e -> e.getHitPos().distanceTo(this.shooter.position())));
|
entityResults.sort(Comparator.comparingDouble(e -> e.getHitPos().distanceTo(this.shooter.position())));
|
||||||
|
|
||||||
for (EntityResult entityResult : entityResults) {
|
for (EntityResult entityResult : entityResults) {
|
||||||
if (!this.beast) {
|
|
||||||
this.bypassArmorRate -= 0.2F;
|
|
||||||
if (this.bypassArmorRate < 0) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
result = new ExtendedEntityRayTraceResult(entityResult);
|
result = new ExtendedEntityRayTraceResult(entityResult);
|
||||||
if (((EntityHitResult) result).getEntity() instanceof Player player) {
|
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;
|
result = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
this.onHit(result);
|
this.onHit(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!this.beast) {
|
||||||
|
this.bypassArmorRate -= 0.2F;
|
||||||
|
if (this.bypassArmorRate < 0.8F) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (entityResults.isEmpty()) {
|
if (entityResults.isEmpty()) {
|
||||||
this.onHit(result);
|
this.onHit(result);
|
||||||
|
|
Loading…
Add table
Reference in a new issue