From 9b1b2e2f230c2e91177e0d7ec28c7dfa08fe7810 Mon Sep 17 00:00:00 2001
From: Atsuishio <842960157@qq.com>
Date: Tue, 29 Apr 2025 14:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=89=E6=A3=B1=E5=9D=A6?=
 =?UTF-8?q?=E5=85=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/entity/vehicle/PrismTankEntity.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
index f38aca017..1012f5654 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
@@ -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