From f45401aceee3cc82cb7b1dc1b8dcafd8b5645e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zhen=D1=91q?= Date: Thu, 6 Apr 2023 03:39:23 +0600 Subject: [PATCH] Server: Fix catas turning off Exo's laser --- Assembly-CSharp/Passive_Exo.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Assembly-CSharp/Passive_Exo.cs b/Assembly-CSharp/Passive_Exo.cs index 54e04fc2..ecbb2a4c 100644 --- a/Assembly-CSharp/Passive_Exo.cs +++ b/Assembly-CSharp/Passive_Exo.cs @@ -167,7 +167,18 @@ public override void PreGatherResultsForPlayerAction(Ability ability) { return; } - if (ability != null && !(ability is ExoAnchorLaser) && !(ability is ExoShield) && IsAnchored()) + + AbilityData abilityData = GetComponent(); + if (ability != null + && !(ability is ExoAnchorLaser) + && !(ability is ExoShield) + && IsAnchored() + // custom -- might cata should not turn the laser off + && !(abilityData != null + && AbilityData.IsCard(abilityData.GetActionTypeOfAbility(ability)) + && ability.IsFreeAction()) + // end custom + ) { RemoveAnchoredLaser(); }