From e421a324757d651d6411092d9b8b566faef1855d Mon Sep 17 00:00:00 2001 From: Meerkov Date: Sun, 29 Apr 2018 19:06:33 -0700 Subject: [PATCH] Style fixes for discussion. (cherry picked from commit 3ae95447a2a91a36bd1772649592ef72ffb344f8) --- forge-ai/src/main/java/forge/ai/ComputerUtil.java | 3 +-- forge-ai/src/main/java/forge/ai/ComputerUtilMana.java | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index 8d7cfee3a4b..86fbc9e25b0 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -2218,8 +2218,7 @@ public class ComputerUtil { } else { // TODO: This is just picking randomly amongst already picked things. It should probably pick the worst instead. List a = Arrays.asList(votes.keySet().toArray()); - Collections.shuffle(a, MyRandom.getRandom()); - return a.get(0); + return a.get(MyRandom.getRandom().nextInt(a.size())); } case "Protection": if (votes.isEmpty()) { diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java index 0671c1b5f14..1514aeb9199 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java @@ -135,7 +135,10 @@ public class ComputerUtilMana { @Override public int compare(final Card card1, final Card card2) { int result = Integer.compare(manaCardMap.get(card1), manaCardMap.get(card2)); - return result != 0 ? result : Float.compare(card1.getTimestamp(), card2.getTimestamp()); + if(result == 0) { + result = Float.compare(card1.getTimestamp(), card2.getTimestamp()); + } + return result; } }); @@ -1006,7 +1009,7 @@ public class ComputerUtilMana { * @return a boolean. */ private static String payMultipleMana(ManaCostBeingPaid testCost, String mana, final Player p) { - List unused = new ArrayList(4); + List unused = new ArrayList<>(4); for (String manaPart : TextUtil.split(mana, ' ')) { if (StringUtils.isNumeric(manaPart)) { for (int i = Integer.parseInt(manaPart); i > 0; i--) {