From dc148d833ab89b108cc2c45d8486fe32b7e0881e Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 3 Aug 2014 18:09:52 +0000 Subject: [PATCH] Code cleanup --- forge-game/src/main/java/forge/game/Game.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index 141725d26c8..81065e0a9dc 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -149,7 +149,6 @@ public class Game { subscribeToEvents(gameLog.getEventVisitor()); } - /** * Gets the players who are still fighting to win, in turn order. * @@ -550,7 +549,6 @@ public class Game { final Map runParams = new TreeMap(); runParams.put("Player", p); this.getTriggerHandler().runTrigger(TriggerType.LosesGame, runParams, false); - } /** @@ -600,17 +598,14 @@ public class Game { for (int i = 0; i < getCardsIn(ZoneType.Command).size(); i++) { Card c = getCardsIn(ZoneType.Command).get(i); if (c.isScheme() && !c.isType("Ongoing")) { - boolean foundonstack = false; for (SpellAbilityStackInstance si : getStack()) { if (si.getSourceCard().equals(c)) { - foundonstack = true; break; } } if (!foundonstack) { - getTriggerHandler().suppressMode(TriggerType.ChangesZone); c.getController().getZone(ZoneType.Command).remove(c); i--; @@ -619,7 +614,6 @@ public class Game { c.getController().getZone(ZoneType.SchemeDeck).add(c); } } - } } @@ -638,7 +632,6 @@ public class Game { } public Multimap chooseCardsForAnte(final boolean matchRarity) { - Multimap anteed = ArrayListMultimap.create(); if (matchRarity) { @@ -708,17 +701,16 @@ public class Game { } } - - } else { + } + else { for (Player player : getPlayers()) { chooseRandomCardsForAnte(player, anteed); } } return anteed; - } - + private void chooseRandomCardsForAnte(final Player player, final Multimap anteed) { final List lib = player.getCardsIn(ZoneType.Library); Predicate goodForAnte = Predicates.not(CardPredicates.Presets.BASIC_LANDS); @@ -729,7 +721,7 @@ public class Game { } anteed.put(player, ante); } - + private Set getValidRarities(final Iterable cards) { Set rarities = new HashSet<>(); for (Card card : cards) {