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:
Atsuishio 2025-04-29 14:37:04 +08:00 • committed by Light_Quanta
parent 457c4fa749
commit 9b1b2e2f23
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
View file

@ -20,6 +20,7 @@ import com.atsuishio.superbwarfare.network.message.receive.ShakeClientMessage;
import com.atsuishio.superbwarfare.tools.CustomExplosion;
import com.atsuishio.superbwarfare.tools.EntityFindUtil;
import com.atsuishio.superbwarfare.tools.ParticleTool;
import com.atsuishio.superbwarfare.tools.SeekTool;
import com.mojang.math.Axis;
import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.Font;
@ -399,7 +400,7 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo
Vec3 viewVec = getBarrelVector(1);
Vec3 toVec = pos.add(viewVec.x * 512, viewVec.y * 512, viewVec.z * 512);
AABB aabb = getBoundingBox().expandTowards(viewVec.scale(512)).inflate(1.0D, 1.0D, 1.0D);
EntityHitResult entityhitresult = ProjectileUtil.getEntityHitResult(this, pos, toVec, aabb, p -> !p.isSpectator() && p.isAlive(), distance);
EntityHitResult entityhitresult = ProjectileUtil.getEntityHitResult(this, pos, toVec, aabb, p -> !p.isSpectator() && p.isAlive() && SeekTool.smokeFilter(p), distance);
if (entityhitresult != null) {
Vec3 targetPos = entityhitresult.getLocation();
double distanceToTarget = pos.distanceToSqr(targetPos);
@ -472,6 +473,7 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo
&& e != this
&& e.getVehicle() != this
&& baseFilter(e)
&& SeekTool.smokeFilter(e)
&& e.getVehicle() == null
&& (!e.isAlliedTo(this) || e.getTeam() == null || e.getTeam().getName().equals("TDM"))).toList();
}
@ -479,7 +481,7 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo
public HitResult pickNew(Vec3 pos, double pHitDistance) {
Vec3 vec31 = this.getBarrelVector(1);
Vec3 vec32 = pos.add(vec31.x * pHitDistance, vec31.y * pHitDistance, vec31.z * pHitDistance);
return this.level().clip(new ClipContext(pos, vec32, ClipContext.Block.COLLIDER, ClipContext.Fluid.ANY, this));
return this.level().clip(new ClipContext(pos, vec32, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this));
}
@Override