Skip to content

Commit d1cc793

Browse files
committed
Fix DinoDashOrShield end pos
1 parent fe546c3 commit d1cc793

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Assembly-CSharp/AreaEffectUtils.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,7 @@ public static Vector3 GetKnockbackOriginFromLaser(
19531953
}
19541954
#endif
19551955

1956+
// TODO make sure we properly use laserEndPos on server -- it is modified even if there are not enough targets hit!
19561957
public static List<ActorData> GetActorsInLaser(
19571958
Vector3 startPos,
19581959
Vector3 dir,

Assembly-CSharp/TargetSelect_LaserChargeWithReverseCones.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ROGUES
22
// SERVER
33
using System.Collections.Generic;
4+
using System.Linq;
45
using AbilityContextNamespace;
56
using UnityEngine;
67

@@ -285,6 +286,7 @@ private Vector3 GetChargeEndPos(List<AbilityTarget> targets, ActorData caster, o
285286
caster.GetSquareAtPhaseStart(),
286287
true);
287288
List<ActorData> actorsOnPath = ClaymoreCharge.GetActorsOnPath(path, caster.GetOtherTeams(), caster);
289+
List<ActorData> evaders = GameFlowData.Get().GetActors().Where(ServerActionBuffer.Get().ActorIsEvading).ToList();
288290
// end custom
289291
List<ActorData> actorsInLaser = AreaEffectUtils.GetActorsInLaser(
290292
loSCheckPos,
@@ -297,8 +299,9 @@ private Vector3 GetChargeEndPos(List<AbilityTarget> targets, ActorData caster, o
297299
1,
298300
true,
299301
true,
300-
out _, // custom, out laserEndPoint in rogues
301-
null);
302+
out laserEndPoint,
303+
null,
304+
evaders); // custom, null in rogues
302305
// custom
303306
actorsInLaser.AddRange(actorsOnPath);
304307
TargeterUtils.SortActorsByDistanceToPos(ref actorsInLaser, loSCheckPos);

0 commit comments

Comments
 (0)