调整光棱坦克
This commit is contained in:
parent
457c4fa749
commit
9b1b2e2f23
1 changed files with 4 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue