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

调整激光击中的终点位置判定

Browse source
This commit is contained in:
17146 2024-12-04 22:05:54 +08:00
parent 6b3d5c007f
commit 678438307e
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/main/java/com/atsuishio/superbwarfare/entity/projectile/LaserEntity.java
View file

@ -75,32 +75,32 @@ public class LaserEntity extends AbstractLaserEntity {
collidePosY = hitVec.y; collidePosY = hitVec.y;
collidePosZ = hitVec.z; collidePosZ = hitVec.z;
blockSide = result.getBlockHit().getDirection(); blockSide = result.getBlockHit().getDirection();
}
List<LivingEntity> entities = world.getEntitiesOfClass(LivingEntity.class, new AABB(Math.min(getX(), collidePosX), Math.min(getY(), collidePosY), Math.min(getZ(), collidePosZ), Math.max(getX(), collidePosX), Math.max(getY(), collidePosY), Math.max(getZ(), collidePosZ)).inflate(1, 1, 1));
for (LivingEntity entity : entities) {
if (entity == this.caster) {
continue;
}
float pad = entity.getPickRadius() + getBaseScale();
AABB aabb = entity.getBoundingBox().inflate(pad, pad, pad);
Optional<Vec3> hit = aabb.clip(from, to);
if (aabb.contains(from)) {
result.addEntityHit(entity);
} else if (hit.isPresent()) {
result.addEntityHit(entity);
}
}
var target = result.getEntities().stream().min(Comparator.comparingDouble(e -> e.distanceToSqr(this.caster)));
if (target.isPresent()) {
collidePosX = target.get().getX();
collidePosY = target.get().getY();
collidePosZ = target.get().getZ();
} else { } else {
collidePosX = endPosX; List<LivingEntity> entities = world.getEntitiesOfClass(LivingEntity.class, new AABB(Math.min(getX(), collidePosX), Math.min(getY(), collidePosY), Math.min(getZ(), collidePosZ), Math.max(getX(), collidePosX), Math.max(getY(), collidePosY), Math.max(getZ(), collidePosZ)).inflate(1, 1, 1));
collidePosY = endPosY; for (LivingEntity entity : entities) {
collidePosZ = endPosZ; if (entity == this.caster) {
continue;
}
float pad = entity.getPickRadius() + getBaseScale();
AABB aabb = entity.getBoundingBox().inflate(pad, pad, pad);
Optional<Vec3> hit = aabb.clip(from, to);
if (aabb.contains(from)) {
result.addEntityHit(entity);
} else if (hit.isPresent()) {
result.addEntityHit(entity);
}
}
var target = result.getEntities().stream().min(Comparator.comparingDouble(e -> e.distanceToSqr(this.caster)));
if (target.isPresent()) {
collidePosX = target.get().getX();
collidePosY = target.get().getY();
collidePosZ = target.get().getZ();
} else {
collidePosX = endPosX;
collidePosY = endPosY;
collidePosZ = endPosZ;
}
blockSide = null; blockSide = null;
} }