Fix DinoDashOrShield end pos

Zheneq · Jun 21, 2024 · d1cc793 · d1cc793
1 parent fe546c3
commit d1cc793
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Assembly-CSharp/AreaEffectUtils.cs b/Assembly-CSharp/AreaEffectUtils.cs
@@ -1953,6 +1953,7 @@ public static Vector3 GetKnockbackOriginFromLaser(
 	}
 #endif
 
+	// TODO make sure we properly use laserEndPos on server -- it is modified even if there are not enough targets hit!
 	public static List<ActorData> GetActorsInLaser(
 		Vector3 startPos,
 		Vector3 dir,

diff --git a/Assembly-CSharp/TargetSelect_LaserChargeWithReverseCones.cs b/Assembly-CSharp/TargetSelect_LaserChargeWithReverseCones.cs
@@ -1,6 +1,7 @@
 // ROGUES
 // SERVER
 using System.Collections.Generic;
+using System.Linq;
 using AbilityContextNamespace;
 using UnityEngine;
 
@@ -285,6 +286,7 @@ private Vector3 GetChargeEndPos(List<AbilityTarget> targets, ActorData caster, o
             caster.GetSquareAtPhaseStart(),
             true);
         List<ActorData> actorsOnPath = ClaymoreCharge.GetActorsOnPath(path, caster.GetOtherTeams(), caster);
+        List<ActorData> evaders = GameFlowData.Get().GetActors().Where(ServerActionBuffer.Get().ActorIsEvading).ToList();
         // end custom
         List<ActorData> actorsInLaser = AreaEffectUtils.GetActorsInLaser(
             loSCheckPos,
@@ -297,8 +299,9 @@ private Vector3 GetChargeEndPos(List<AbilityTarget> targets, ActorData caster, o
             1,
             true,
             true,
-            out _,  // custom, out laserEndPoint in rogues
-            null);
+            out laserEndPoint,
+            null,
+            evaders); // custom, null in rogues
         // custom
         actorsInLaser.AddRange(actorsOnPath);
         TargeterUtils.SortActorsByDistanceToPos(ref actorsInLaser, loSCheckPos);