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

修复近防炮炮弹拦截bug

Browse source
This commit is contained in:
Atsuishio 2025-07-10 13:25:38 +08:00 • committed by Light_Quanta
parent c86dc2341a
commit 1742e1b706
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmallCannonShellEntity.java
View file

@ -36,6 +36,9 @@ import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache;
import software.bernie.geckolib.animation.AnimatableManager; import software.bernie.geckolib.animation.AnimatableManager;
import software.bernie.geckolib.util.GeckoLibUtil; import software.bernie.geckolib.util.GeckoLibUtil;
import java.util.Comparator;
import java.util.Optional;
public class SmallCannonShellEntity extends FastThrowableProjectile implements GeoEntity, ExplosiveProjectile { public class SmallCannonShellEntity extends FastThrowableProjectile implements GeoEntity, ExplosiveProjectile {
private float damage = 40.0f; private float damage = 40.0f;
private float explosionDamage = 80f; private float explosionDamage = 80f;
@ -194,15 +197,15 @@ public class SmallCannonShellEntity extends FastThrowableProjectile implements G
public void crushProjectile(Vec3 velocity) { public void crushProjectile(Vec3 velocity) {
if (this.level() instanceof ServerLevel) { if (this.level() instanceof ServerLevel) {
var frontBox = getBoundingBox().inflate(3).expandTowards(velocity); var frontBox = getBoundingBox().inflate(0.5).expandTowards(velocity);
var entities = level().getEntities( Optional<Projectile> target = level().getEntities(
EntityTypeTest.forClass(Projectile.class), frontBox, entity -> entity != this).stream() EntityTypeTest.forClass(Projectile.class), frontBox, entity -> entity != this).stream()
.filter(entity -> !(entity instanceof SmallCannonShellEntity) && (entity.getBbWidth() >= 0.3 || entity.getBbHeight() >= 0.3)) .filter(entity -> !(entity instanceof SmallCannonShellEntity) && (entity.getBbWidth() >= 0.3 || entity.getBbHeight() >= 0.3))
.toList(); .min(Comparator.comparingDouble(e -> e.position().distanceTo(position())));
for (var entity : entities) { if (target.isPresent()) {
causeExplode(entity.position(), false); causeExplode(target.get().position(), false);
entity.discard(); target.get().discard();
this.discard(); this.discard();
} }
} }