From e28b683b891e0a6989787ae48bbd9dd2096c13d9 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 13 Apr 2018 21:43:31 +0300 Subject: [PATCH] - Correct some code style issues. --- forge-ai/src/main/java/forge/ai/ComputerUtilCard.java | 4 ++-- forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java | 7 +++---- forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java | 6 ++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index 68ac9a8faf8..99b42a343f7 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java @@ -97,7 +97,7 @@ public class ComputerUtilCard { */ public static Card getBestPlaneswalkerAI(final List list) { List all = CardLists.filter(list, CardPredicates.Presets.PLANESWALKERS); - if (all.size() == 0) { + if (all.isEmpty()) { return null; } // no AI logic, just return most expensive @@ -111,7 +111,7 @@ public class ComputerUtilCard { */ public static Card getWorstPlaneswalkerAI(final List list) { List all = CardLists.filter(list, CardPredicates.Presets.PLANESWALKERS); - if (all.size() == 0) { + if (all.isEmpty()) { return null; } // no AI logic, just return least expensive diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java b/forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java index 62a35eaa133..b252db592b1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java @@ -84,10 +84,9 @@ public abstract class DamageAiBase extends SpellAbilityAi { // burn Planeswalkers // TODO: Must be removed completely when the "planeswalker redirection" rule is removed. - if (!noPlaneswalkerRedirection) { - if (Iterables.any(enemy.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS)) { - return true; - } + if (!noPlaneswalkerRedirection + && Iterables.any(enemy.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS)) { + return true; } if (avoidTargetP(comp, sa)) { diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index 09d858402e2..04210b7d832 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -361,10 +361,8 @@ public class DamageDealAi extends DamageAiBase { return ComputerUtilCard.getBestPlaneswalkerAI(killables); } - if (!hPlay.isEmpty()) { - if (pl.isOpponentOf(ai) && activator.equals(ai)) { - return ComputerUtilCard.getBestPlaneswalkerAI(hPlay); - } + if (!hPlay.isEmpty() && pl.isOpponentOf(ai) && activator.equals(ai)) { + return ComputerUtilCard.getBestPlaneswalkerAI(hPlay); } return null;