添加注解,修复潜在的问题

This commit is contained in:
17146 2024-09-14 22:12:34 +08:00
parent ee821b9fc9
commit 420a71a4ee

View file

@ -87,6 +87,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
|| input.getBlock() instanceof TrapDoorBlock || input.getBlock() instanceof TrapDoorBlock
|| input.getBlock() instanceof BarbedWireBlock); || input.getBlock() instanceof BarbedWireBlock);
@Nullable
protected LivingEntity shooter; protected LivingEntity shooter;
protected int shooterId; protected int shooterId;
private float damage = 1f; private float damage = 1f;
@ -321,8 +322,10 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
} }
if (state.getBlock() instanceof TargetBlock) { if (state.getBlock() instanceof TargetBlock) {
if (this.shooter == null) return;
int rings = getRings(blockHitResult, hitVec); int rings = getRings(blockHitResult, hitVec);
double dis = shooter.position().distanceTo(hitVec); double dis = this.shooter.position().distanceTo(hitVec);
recordHitScore(rings, dis); recordHitScore(rings, dis);
} }
@ -422,6 +425,8 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
// TODO 实现穿甲比例大于1时的穿透生物效果 // TODO 实现穿甲比例大于1时的穿透生物效果
protected void onHitEntity(Entity entity, boolean headshot, boolean legShot) { protected void onHitEntity(Entity entity, boolean headshot, boolean legShot) {
if (this.shooter == null) return;
float mMultiple = 1 + this.monsterMultiple; float mMultiple = 1 + this.monsterMultiple;
if (entity == null) return; if (entity == null) return;
@ -449,7 +454,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa
p -> p.sendSystemMessage( p -> p.sendSystemMessage(
Component.translatable("death.attack.beast_gun", Component.translatable("death.attack.beast_gun",
victim.getDisplayName(), victim.getDisplayName(),
shooter.getDisplayName() shooter == null ? "" : shooter.getDisplayName()
) )
) )
); );