From f83c2bea4b4444baaf265133c0a32520686c345b Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 19 Apr 2025 17:48:27 +0400 Subject: [PATCH] merge fix --- .../src/mage/player/ai/GameStateEvaluator2.java | 2 +- .../main/java/mage/player/ai/simulators/ActionSimulator.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java index f1d7b64205a..ebc0dbcdade 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/GameStateEvaluator2.java @@ -32,7 +32,7 @@ public final class GameStateEvaluator2 { public static PlayerEvaluateScore evaluate(UUID playerId, Game game, boolean useCombatPermanentScore) { // TODO: add multi opponents support, so AI can take better actions Player player = game.getPlayer(playerId); - // must find all leaved opponents too + // must find all leaved opponents Player opponent = game.getPlayer(game.getOpponents(playerId, false).stream().findFirst().orElse(null)); if (opponent == null) { return new PlayerEvaluateScore(playerId, WIN_GAME_SCORE); diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/ActionSimulator.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/ActionSimulator.java index 6f112e25441..e67d6383710 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/ActionSimulator.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/ActionSimulator.java @@ -34,7 +34,8 @@ public class ActionSimulator { } public int evaluateState() { - Player opponent = game.getPlayer(game.getOpponents(player.getId(), true).stream().findFirst().orElse(null)); + // must find all leaved opponents + Player opponent = game.getPlayer(game.getOpponents(player.getId(), false).stream().findFirst().orElse(null)); if (opponent == null) { return Integer.MAX_VALUE; }