kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复projectile伤害类型不正确的问题

Browse source
This commit is contained in:
17146 2025-04-07 05:06:41 +08:00 • committed by Light_Quanta
parent 7db5683de1
commit 5fe6c96b01
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java
View file

@ -65,7 +65,7 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
@SuppressWarnings({"unused", "UnusedReturnValue", "SuspiciousNameCombination"})
@SuppressWarnings({"unused", "UnusedReturnValue"})
public class ProjectileEntity extends Projectile implements IEntityWithComplexSpawn, GeoEntity, CustomSyncMotionEntity {
public static final EntityDataAccessor<Float> COLOR_R = SynchedEntityData.defineId(ProjectileEntity.class, EntityDataSerializers.FLOAT);
@ -742,13 +742,16 @@ public class ProjectileEntity extends Projectile implements IEntityWithComplexSp
float headShotModifier = isHeadshot ? this.headShot : 1;
if (normalDamage > 0) {
entity.hurt(ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.shooter), normalDamage * headShotModifier);
entity.hurt(isHeadshot ? ModDamageTypes.causeGunFireHeadshotDamage(this.level().registryAccess(), this, this.shooter)
: ModDamageTypes.causeGunFireDamage(this.level().registryAccess(), this, this.shooter), normalDamage * headShotModifier);
entity.invulnerableTime = 0;
}
if (absoluteDamage > 0) {
entity.hurt(ModDamageTypes.causeGunFireHeadshotAbsoluteDamage(this.level().registryAccess(), this, this.shooter), absoluteDamage * headShotModifier);
entity.hurt(isHeadshot ? ModDamageTypes.causeGunFireHeadshotAbsoluteDamage(this.level().registryAccess(), this, this.shooter)
: ModDamageTypes.causeGunFireAbsoluteDamage(this.level().registryAccess(), this, this.shooter), absoluteDamage * headShotModifier);
entity.invulnerableTime = 0;
// 大于1的穿甲对载具造成额外伤害
if (entity instanceof VehicleEntity vehicle && this.bypassArmorRate > 1) {
vehicle.hurt(ModDamageTypes.causeGunFireAbsoluteDamage(this.level().registryAccess(), this, this.shooter), absoluteDamage * (this.bypassArmorRate - 1) * 0.5f);
}