diff --git a/Desktop/GameMapTesting/GameMapTesting.cs b/Desktop/GameMapTesting/GameMapTesting.cs index b2686f2..1d0329a 100644 --- a/Desktop/GameMapTesting/GameMapTesting.cs +++ b/Desktop/GameMapTesting/GameMapTesting.cs @@ -649,7 +649,7 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting private static bool IsRoundHasPlayer_OnlyTest(GamingQueue queue, Character current) { - return queue.CustomData.TryGetValue("player", out object? value) && value is Character player && (player == current || (current.CharacterState != CharacterState.Casting && queue.LastRound.Targets.Any(c => c == player))); + return queue.CustomData.TryGetValue("player", out object? value) && value is Character player && (player == current || (current.CharacterState != CharacterState.Casting && queue.LastRound.Targets.Values.SelectMany(c => c).Any(c => c == player))); } public async Task SetPreCastSuperSkill(Character character, Skill skill) diff --git a/Library/Tests/FunGame.cs b/Library/Tests/FunGame.cs index 34486ae..fc261c2 100644 --- a/Library/Tests/FunGame.cs +++ b/Library/Tests/FunGame.cs @@ -705,7 +705,7 @@ namespace Milimoe.FunGame.Testing.Tests private static bool IsRoundHasPlayer_OnlyTest(GamingQueue queue, Character current) { - return queue.CustomData.TryGetValue("player", out object? value) && value is Character player && (player == current || (current.CharacterState != CharacterState.Casting && queue.LastRound.Targets.Any(c => c == player))); + return queue.CustomData.TryGetValue("player", out object? value) && value is Character player && (player == current || (current.CharacterState != CharacterState.Casting && queue.LastRound.Targets.Values.SelectMany(c => c).Any(c => c == player))); } public static void WriteLine(string str)