From e89c12255bf6cc0d7d147f2f792224877238d3d2 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 21 May 2023 15:16:49 +0800 Subject: [PATCH 1/2] fix NPE on CommanderGauntlet --- .../main/java/forge/gamemodes/gauntlet/GauntletUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java index 58ab25885e7..d133af275e0 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletUtil.java @@ -120,12 +120,14 @@ public class GauntletUtil { break; case COMMANDER_DECK: deck = DeckgenUtil.getCommanderDeck(); - eventNames.add(deck.getName()); + if (deck != null) + eventNames.add(deck.getName()); break; default: continue; } - decks.add(deck); + if (deck != null) + decks.add(deck); } gauntlet.setDecks(decks); From ea62081c00e569d2ca0d90a7fb0e26224234b157 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 21 May 2023 11:36:55 +0300 Subject: [PATCH 2/2] AI: Always prioritize creatures by evaluateCreature (#3142) * - Improve AI for Tempered Veteran. * - AI: always evaluate creatures via evaluateCreature when deciding priority. --- forge-ai/src/main/java/forge/ai/AiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 04d69d7ad41..39b741578d9 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -1083,7 +1083,7 @@ public class AiController { } // If both are permanent creature spells, prefer the one that evaluates higher - if (a1 == b1 && a.getApi() == ApiType.PermanentCreature && b.getApi() == ApiType.PermanentCreature) { + if (a.getApi() == ApiType.PermanentCreature && b.getApi() == ApiType.PermanentCreature) { int evalA = ComputerUtilCard.evaluateCreature(a); int evalB = ComputerUtilCard.evaluateCreature(b); if (evalA > evalB) {