From 7aef8ff684e8a754bb445fafe197218330a537bb Mon Sep 17 00:00:00 2001
From: CrimRecya <335958461@qq.com>
Date: Wed, 19 Feb 2025 21:07:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E9=95=BF=E8=B7=9D?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp b/src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp
index 62429ebd2e..99efdafef1 100644
--- a/src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp
+++ b/src/Ext/Bullet/Trajectories/DisperseTrajectory.cpp
@@ -959,7 +959,7 @@ bool DisperseTrajectory::PrepareDisperseWeapon(BulletClass* pBullet)
 								{
 									const auto pObjType = pObject->GetType();
 
-									if (pObjType && !pObjType->Immune)
+									if (pObjType && !pObjType->Immune && centerCoords.DistanceFrom(pObject->GetCoords()) <= pWeapon->Range)
 										validObjects.push_back(pObject);
 								}
 
@@ -1003,6 +1003,9 @@ bool DisperseTrajectory::PrepareDisperseWeapon(BulletClass* pBullet)
 									continue;
 							}
 
+							if (centerCoords.DistanceFrom(pTechno->GetCoords()) > pWeapon->Range)
+								continue;
+
 							if (MapClass::GetTotalDamage(100, pWeapon->Warhead, pTechnoType->Armor, 0) == 0)
 								continue;
 
@@ -1046,6 +1049,9 @@ bool DisperseTrajectory::PrepareDisperseWeapon(BulletClass* pBullet)
 							continue;
 					}
 
+					if (centerCoords.DistanceFrom(pTechno->GetCoords()) > pWeapon->Range)
+						continue;
+
 					if (MapClass::GetTotalDamage(100, pWeapon->Warhead, pTechnoType->Armor, 0) == 0)
 						continue;