diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java index 1bbe5a332..b5b6394d2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java @@ -406,12 +406,7 @@ public abstract class VehicleEntity extends Entity { if (source.is(DamageTypes.CACTUS) || source.is(DamageTypes.SWEET_BERRY_BUSH) || source.is(DamageTypes.IN_WALL)) return false; // 计算减伤后的伤害 - float computedAmount; - if (this.level().isClientSide) { - computedAmount = amount; - } else { - computedAmount = getDamageModifier().compute(source, amount); - } + float computedAmount = getDamageModifier().compute(source, amount); this.crash = source.is(ModDamageTypes.VEHICLE_STRIKE); if (source.getEntity() != null) { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModify.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModify.java index c605f3cf9..b93beffef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModify.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModify.java @@ -110,6 +110,8 @@ public class DamageModify { * @return 伤害来源是否符合条件 */ public boolean match(DamageSource source) { + if (source == null) return false; + if (sourceType == null) { generateSourceType(); }