Updates the project for Java 8.

Maps.newHashMap() was replaced with null in numerous locations. A null check is performed in the locations that read this value. This prevents unnecessary allocation of memory and fixes compiler errors.

"final" keyword added to RepeatEachEffect, which used local variables in non-local scope.

forge-ai/.classpath

@@ -2,8 +2,9 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

forge-core/.classpath

@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

forge-game/.classpath

@@ -2,9 +2,10 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/forge-core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

forge-game/src/main/java/forge/game/GameAction.java

@@ -80,7 +80,7 @@ public class GameAction {
     }
 
     public Card changeZone(final Zone zoneFrom, Zone zoneTo, final Card c, Integer position, SpellAbility cause) {
-        return changeZone(zoneFrom, zoneTo, c, position, cause, Maps.newHashMap());
+        return changeZone(zoneFrom, zoneTo, c, position, cause, null);
     }
     
     public Card changeZone(final Zone zoneFrom, Zone zoneTo, final Card c, Integer position, SpellAbility cause, Map<String, Object> params) {
@@ -288,7 +288,9 @@ public class GameAction {
             repParams.put("Origin", zoneFrom != null ? zoneFrom.getZoneType() : null);
             repParams.put("Destination", zoneTo.getZoneType());
 
+            if (params != null) {
                 repParams.putAll(params);
+            }
 
             ReplacementResult repres = game.getReplacementHandler().run(repParams);
             if (repres != ReplacementResult.NotReplaced) {
@@ -387,13 +389,19 @@ public class GameAction {
         runParams.put("Destination", zoneTo.getZoneType().name());
         runParams.put("SpellAbilityStackInstance", game.stack.peek());
         runParams.put("IndividualCostPaymentInstance", game.costPaymentStack.peek());
+
+        if (params != null) {
             runParams.putAll(params);
+        }
+
         game.getTriggerHandler().runTrigger(TriggerType.ChangesZone, runParams, true);
         if (zoneFrom != null && zoneFrom.is(ZoneType.Battlefield)) {
             final Map<String, Object> runParams2 = Maps.newHashMap();
             runParams2.put("Card", lastKnownInfo);
             runParams2.put("OriginalController", zoneFrom.getPlayer());
+            if(params != null) {
                 runParams2.putAll(params);
+            }
             game.getTriggerHandler().runTrigger(TriggerType.ChangesController, runParams2, false);
         }
         // AllZone.getStack().chooseOrderOfSimultaneousStackEntryAll();
@@ -535,7 +543,7 @@ public class GameAction {
     }
 
     public final Card moveTo(final Zone zoneTo, Card c, SpellAbility cause) {
-        return moveTo(zoneTo, c, cause, Maps.newHashMap());
+        return moveTo(zoneTo, c, cause, null);
     }
     
     public final Card moveTo(final Zone zoneTo, Card c, SpellAbility cause, Map<String, Object> params) {
@@ -545,7 +553,7 @@ public class GameAction {
     }
 
     public final Card moveTo(final Zone zoneTo, Card c, Integer position, SpellAbility cause) {
-        return moveTo(zoneTo, c, position, cause, Maps.newHashMap());
+        return moveTo(zoneTo, c, position, cause, null);
     }
     
     public final Card moveTo(final Zone zoneTo, Card c, Integer position, SpellAbility cause, Map<String, Object> params) {
@@ -621,7 +629,7 @@ public class GameAction {
     }
 
     public final Card moveToStack(final Card c, SpellAbility cause) {
-        return moveToStack(c, cause, Maps.newHashMap());
+        return moveToStack(c, cause, null);
     }
     public final Card moveToStack(final Card c, SpellAbility cause, Map<String, Object> params) {
         final Zone stack = game.getStackZone();
@@ -629,7 +637,7 @@ public class GameAction {
     }
 
     public final Card moveToGraveyard(final Card c, SpellAbility cause) {
-        return moveToGraveyard(c, cause, Maps.newHashMap());
+        return moveToGraveyard(c, cause, null);
     }
     public final Card moveToGraveyard(final Card c, SpellAbility cause, Map<String, Object> params) {
         final PlayerZone grave = c.getOwner().getZone(ZoneType.Graveyard);
@@ -638,7 +646,7 @@ public class GameAction {
     }
 
     public final Card moveToHand(final Card c, SpellAbility cause) {
-        return moveToHand(c, cause, Maps.newHashMap());
+        return moveToHand(c, cause, null);
     }
     
     public final Card moveToHand(final Card c, SpellAbility cause, Map<String, Object> params) {
@@ -647,7 +655,7 @@ public class GameAction {
     }
 
     public final Card moveToPlay(final Card c, SpellAbility cause) {
-        return moveToPlay(c, cause, Maps.newHashMap());
+        return moveToPlay(c, cause, null);
     }
     
     public final Card moveToPlay(final Card c, SpellAbility cause, Map<String, Object> params) {
@@ -656,7 +664,7 @@ public class GameAction {
     }
 
     public final Card moveToPlay(final Card c, final Player p, SpellAbility cause) {
-        return moveToPlay(c, p, cause, Maps.newHashMap());
+        return moveToPlay(c, p, cause, null);
     }
     
     public final Card moveToPlay(final Card c, final Player p, SpellAbility cause, Map<String, Object> params) {
@@ -666,7 +674,7 @@ public class GameAction {
     }
 
     public final Card moveToBottomOfLibrary(final Card c, SpellAbility cause) {
-        return moveToBottomOfLibrary(c, cause, Maps.newHashMap());
+        return moveToBottomOfLibrary(c, cause, null);
     }
     
     public final Card moveToBottomOfLibrary(final Card c, SpellAbility cause, Map<String, Object> params) {
@@ -674,7 +682,7 @@ public class GameAction {
     }
 
     public final Card moveToLibrary(final Card c, SpellAbility cause) {
-        return moveToLibrary(c, cause, Maps.newHashMap());
+        return moveToLibrary(c, cause, null);
     }
     
     public final Card moveToLibrary(final Card c, SpellAbility cause, Map<String, Object> params) {
@@ -682,7 +690,7 @@ public class GameAction {
     }
 
     public final Card moveToLibrary(Card c, int libPosition, SpellAbility cause) {
-        return moveToLibrary(c, libPosition, cause, Maps.newHashMap());
+        return moveToLibrary(c, libPosition, cause, null);
     }
     
     public final Card moveToLibrary(Card c, int libPosition, SpellAbility cause, Map<String, Object> params) {
@@ -694,7 +702,7 @@ public class GameAction {
     }
 
     public final Card moveToVariantDeck(Card c, ZoneType zone, int deckPosition, SpellAbility cause) {
-        return moveToVariantDeck(c, zone, deckPosition, cause, Maps.newHashMap());
+        return moveToVariantDeck(c, zone, deckPosition, cause, null);
     }
     
     public final Card moveToVariantDeck(Card c, ZoneType zone, int deckPosition, SpellAbility cause, Map<String, Object> params) {
@@ -706,7 +714,7 @@ public class GameAction {
     }
 
     public final Card exile(final Card c, SpellAbility cause) {
-        return exile(c, cause, Maps.newHashMap());
+        return exile(c, cause, null);
     }
     public final Card exile(final Card c, SpellAbility cause, Map<String, Object> params) {
         if (game.isCardExiled(c)) {
@@ -717,7 +725,7 @@ public class GameAction {
     }
 
     public final Card moveTo(final ZoneType name, final Card c, SpellAbility cause) {
-        return moveTo(name, c, cause, Maps.newHashMap());
+        return moveTo(name, c, cause, null);
     }
     
     public final Card moveTo(final ZoneType name, final Card c, SpellAbility cause, Map<String, Object> params) {
@@ -725,7 +733,7 @@ public class GameAction {
     }
     
     public final Card moveTo(final ZoneType name, final Card c, final int libPosition, SpellAbility cause) {
-        return moveTo(name, c, libPosition, cause, Maps.newHashMap());
+        return moveTo(name, c, libPosition, cause, null);
     }
 
     public final Card moveTo(final ZoneType name, final Card c, final int libPosition, SpellAbility cause, Map<String, Object> params) {
@@ -1095,7 +1103,7 @@ public class GameAction {
 
             if (!perm.isInZone(tgtZone) || !perm.canBeEnchantedBy(c, true) || (perm.isPhasedOut() && !c.isPhasedOut())) {
                 c.unEnchantEntity(perm);
-                moveToGraveyard(c, null, Maps.newHashMap());
+                moveToGraveyard(c, null, null);
                 checkAgain = true;
             }
         } else if (entity instanceof Player) {
@@ -1113,13 +1121,13 @@ public class GameAction {
             }
             if (invalid) {
                 c.unEnchantEntity(pl);
-                moveToGraveyard(c, null, Maps.newHashMap());
+                moveToGraveyard(c, null, null);
                 checkAgain = true;
             }
         }
 
         if (c.isInPlay() && !c.isEnchanting()) {
-            moveToGraveyard(c, null, Maps.newHashMap());
+            moveToGraveyard(c, null, null);
             checkAgain = true;
         }
         return checkAgain;
@@ -1310,7 +1318,7 @@ public class GameAction {
 
         for (Card c : list) {
             if (c.getCounters(CounterType.LOYALTY) <= 0) {
-                moveToGraveyard(c, null, Maps.newHashMap());
+                moveToGraveyard(c, null, null);
                 // Play the Destroy sound
                 game.fireEvent(new GameEventCardDestroyed());
                 recheck = true;
@@ -1517,7 +1525,7 @@ public class GameAction {
             return null;
         }
 
-        final Card newCard = moveToGraveyard(c, cause, Maps.newHashMap());
+        final Card newCard = moveToGraveyard(c, cause, null);
 
         return newCard;
     }
@@ -1739,7 +1747,7 @@ public class GameAction {
                     if (!isCommander) {
                         toMulligan = new CardCollection(p.getCardsIn(ZoneType.Hand));
                         for (final Card c : toMulligan) {
-                            moveToLibrary(c, null, Maps.newHashMap());
+                            moveToLibrary(c, null, null);
                         }
                         try {
                             Thread.sleep(100); //delay for a tiny bit to give UI a chance catch up
@@ -1751,7 +1759,7 @@ public class GameAction {
                     } else {
                         List<Card> toExile = Lists.newArrayList(toMulligan);
                         for (Card c : toExile) {
-                            exile(c, null, Maps.newHashMap());
+                            exile(c, null, null);
                         }
                         exiledDuringMulligans.addAll(p, toExile);
                         try {
@@ -1777,7 +1785,7 @@ public class GameAction {
                 Player p = kv.getKey();
                 Collection<Card> cc = kv.getValue();
                 for (Card c : cc) {
-                    moveToLibrary(c, null, Maps.newHashMap());
+                    moveToLibrary(c, null, null);
                 }
                 p.shuffle(null);
             }

forge-game/src/main/java/forge/game/GameFormat.java

@@ -77,7 +77,7 @@ public class GameFormat implements Comparable<GameFormat> {
         allowedSetCodes = sets == null ? new ArrayList<String>() : Lists.newArrayList(sets);
         bannedCardNames = bannedCards == null ? new ArrayList<String>() : Lists.newArrayList(bannedCards);
         restrictedCardNames = restrictedCards == null ? new ArrayList<String>() : Lists.newArrayList(restrictedCards);
-        allowedRarities = rarities == null ? Lists.newArrayList() : rarities;
+        allowedRarities = rarities == null ? new ArrayList<CardRarity>() : rarities;
 
         this.allowedSetCodes_ro = Collections.unmodifiableList(allowedSetCodes);
         this.bannedCardNames_ro = Collections.unmodifiableList(bannedCardNames);
@@ -91,7 +91,7 @@ public class GameFormat implements Comparable<GameFormat> {
         if (!this.allowedSetCodes_ro.isEmpty()) {
             p = Predicates.and(p, printed ?
                     IPaperCard.Predicates.printedInSets(this.allowedSetCodes_ro, printed) :
-                    StaticData.instance().getCommonCards().wasPrintedInSets(this.allowedSetCodes_ro));
+                    (Predicate<PaperCard>)(StaticData.instance().getCommonCards().wasPrintedInSets(this.allowedSetCodes_ro)));
         }
         if (!this.allowedRarities.isEmpty()) {
             List<Predicate<? super PaperCard>> crp = Lists.newArrayList();

forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java

@@ -467,7 +467,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     }
                 }
 
-                movedCard = game.getAction().moveToLibrary(tgtC, libraryPosition, sa, Maps.newHashMap());
+                movedCard = game.getAction().moveToLibrary(tgtC, libraryPosition, sa, null);
 
             } else {
                 if (destination.equals(ZoneType.Battlefield)) {
@@ -559,7 +559,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     }
 
                     movedCard = game.getAction().moveTo(
-                            tgtC.getController().getZone(destination), tgtC, sa, Maps.newHashMap());
+                            tgtC.getController().getZone(destination), tgtC, sa, null);
                     if (sa.hasParam("Unearth")) {
                         movedCard.setUnearthed(true);
                         movedCard.addExtrinsicKeyword("Haste");
@@ -602,7 +602,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                         }
                         tgtC.setExiledWith(host);
                     }
-                    movedCard = game.getAction().moveTo(destination, tgtC, sa, Maps.newHashMap());
+                    movedCard = game.getAction().moveTo(destination, tgtC, sa, null);
                     // If a card is Exiled from the stack, remove its spells from the stack
                     if (sa.hasParam("Fizzle")) {
                         if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand)
@@ -966,7 +966,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             Card movedCard = null;
             final Zone originZone = game.getZoneOf(c);
             if (destination.equals(ZoneType.Library)) {
-                movedCard = game.getAction().moveToLibrary(c, libraryPos, sa, Maps.newHashMap());
+                movedCard = game.getAction().moveToLibrary(c, libraryPos, sa, null);
             }
             else if (destination.equals(ZoneType.Battlefield)) {
                 if (sa.hasParam("Tapped")) {
@@ -1101,7 +1101,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                         }
                     }
                 }
-                movedCard = game.getAction().moveTo(c.getController().getZone(destination), c, sa, Maps.newHashMap());
+                movedCard = game.getAction().moveTo(c.getController().getZone(destination), c, sa, null);
                 if (sa.hasParam("Tapped")) {
                     movedCard.setTapped(true);
                 }
@@ -1111,7 +1111,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 movedCard.setTimestamp(ts);
             }
             else if (destination.equals(ZoneType.Exile)) {
-                movedCard = game.getAction().exile(c, sa, Maps.newHashMap());
+                movedCard = game.getAction().exile(c, sa, null);
                 if (!c.isToken()) {
                     Card host = sa.getOriginalHost();
                     if (host == null) {
@@ -1124,7 +1124,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 }
             }
             else {
-                movedCard = game.getAction().moveTo(destination, c, sa, Maps.newHashMap());
+                movedCard = game.getAction().moveTo(destination, c, sa, null);
             }
             
             movedCards.add(movedCard);

forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java

@@ -342,7 +342,7 @@ public class CopyPermanentEffect extends SpellAbilityEffect {
 
                     // Temporarily register triggers of an object created with CopyPermanent
                     //game.getTriggerHandler().registerActiveTrigger(copy, false);
-                    final Card copyInPlay = game.getAction().moveToPlay(copy, sa, Maps.newHashMap());
+                    final Card copyInPlay = game.getAction().moveToPlay(copy, sa, null);
 
                     // when copying something stolen:
                     copyInPlay.setSetCode(c.getSetCode());

forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java

@@ -27,9 +27,9 @@ public class RepeatEachEffect extends SpellAbilityEffect {
     @SuppressWarnings("serial")
     @Override
     public void resolve(SpellAbility sa) {
-        Card source = sa.getHostCard();
+        final Card source = sa.getHostCard();
 
-        AbilitySub repeat = sa.getAdditionalAbility("RepeatSubAbility");
+        final AbilitySub repeat = sa.getAdditionalAbility("RepeatSubAbility");
 
         if (repeat != null && !repeat.getHostCard().equalsWithTimestamp(source)) {
             // TODO: for some reason, the host card of the original additional SA is set to the cloned card when
@@ -121,7 +121,7 @@ public class RepeatEachEffect extends SpellAbilityEffect {
                     repeatPlayers.add(size - 1, repeatPlayers.remove(0));
                 }
             }
-            for (Player p : repeatPlayers) {
+            for (final Player p : repeatPlayers) {
                 if (optional && !p.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"))) {
                     continue;
                 }

forge-game/src/main/java/forge/game/cost/CostAdjustment.java

@@ -223,7 +223,7 @@ public class CostAdjustment {
                         cardsToDelveOut.add(c);
                     } else if (!test) {
                         sa.getHostCard().addDelved(c);
-                        delved.add(game.getAction().exile(c, null, Maps.newHashMap()));
+                        delved.add(game.getAction().exile(c, null, null));
                     }
                 }
                 if (!delved.isEmpty()) {

forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java

@@ -111,7 +111,7 @@ public class ManaCostBeingPaid {
 
     // holds Mana_Part objects
     // ManaPartColor is stored before ManaPartGeneric
-    private final Map<ManaCostShard, ShardCount> unpaidShards = Maps.newHashMap();
+    private final Map<ManaCostShard, ShardCount> unpaidShards = new HashMap<ManaCostShard, ShardCount>();
     private Map<String, Integer> xManaCostPaidByColor;
     private final String sourceRestriction;
     private byte sunburstMap = 0;

forge-game/src/main/java/forge/game/player/Player.java

@@ -240,7 +240,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         activeScheme = getZone(ZoneType.SchemeDeck).get(0);
         // gameAction moveTo ?
-        game.getAction().moveTo(ZoneType.Command, activeScheme, null, Maps.newHashMap());
+        game.getAction().moveTo(ZoneType.Command, activeScheme, null, null);
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
 
         // Run triggers
@@ -1212,7 +1212,7 @@ public class Player extends GameEntity implements Comparable<Player> {
 
         if (toBottom != null) {
             for(Card c : toBottom) {
-                getGame().getAction().moveToBottomOfLibrary(c, null, Maps.newHashMap());
+                getGame().getAction().moveToBottomOfLibrary(c, null, null);
                 numToBottom++;
             }
         }
@@ -1220,7 +1220,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         if (toTop != null) {
             Collections.reverse(toTop); // the last card in list will become topmost in library, have to revert thus.
             for(Card c : toTop) {
-                getGame().getAction().moveToLibrary(c, null, Maps.newHashMap());
+                getGame().getAction().moveToLibrary(c, null, null);
                 numToTop++;
             }
         }
@@ -1293,7 +1293,7 @@ public class Player extends GameEntity implements Comparable<Player> {
                 }
             }
 
-            c = game.getAction().moveToHand(c, null, Maps.newHashMap());
+            c = game.getAction().moveToHand(c, null, null);
             drawn.add(c);
 
             if (topCardRevealed) {
@@ -1503,16 +1503,16 @@ public class Player extends GameEntity implements Comparable<Player> {
         sb.append(this).append(" discards ").append(c);
         final Card newCard;
         if (discardToTopOfLibrary) {
-            newCard = game.getAction().moveToLibrary(c, 0, sa, Maps.newHashMap());
+            newCard = game.getAction().moveToLibrary(c, 0, sa, null);
             sb.append(" to the library");
             // Play the Discard sound
         }
         else if (discardMadness) {
-            newCard = game.getAction().exile(c, sa, Maps.newHashMap());
+            newCard = game.getAction().exile(c, sa, null);
             sb.append(" with Madness");
         }
         else {
-            newCard = game.getAction().moveToGraveyard(c, sa, Maps.newHashMap());
+            newCard = game.getAction().moveToGraveyard(c, sa, null);
             // Play the Discard sound
         }
         sb.append(".");
@@ -1580,7 +1580,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         }
 
         for (Card m : milledView) {
-            game.getAction().moveTo(destination, m, null, Maps.newHashMap());
+            game.getAction().moveTo(destination, m, null, null);
         }
 
         return milled;
@@ -1648,7 +1648,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             if (land.isFaceDown()) {
                 land.turnFaceUp();
             }
-            game.getAction().moveTo(getZone(ZoneType.Battlefield), land, null, Maps.newHashMap());
+            game.getAction().moveTo(getZone(ZoneType.Battlefield), land, null, new HashMap<String, Object>());
 
             // play a sound
             game.fireEvent(new GameEventLandPlayed(this, land));
@@ -2430,7 +2430,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         game.getView().updatePlanarPlayer(getView());
 
         for (Card c : currentPlanes) {
-            game.getAction().moveTo(ZoneType.Command,c, null, Maps.newHashMap());
+            game.getAction().moveTo(ZoneType.Command,c, null, null);
             //getZone(ZoneType.PlanarDeck).remove(c);
             //getZone(ZoneType.Command).add(c);
         }
@@ -2460,7 +2460,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             //game.getZoneOf(plane).remove(plane);
             plane.clearControllers();
             //getZone(ZoneType.PlanarDeck).add(plane);
-            game.getAction().moveTo(ZoneType.PlanarDeck, plane,-1, null, Maps.newHashMap());
+            game.getAction().moveTo(ZoneType.PlanarDeck, plane,-1, null, null);
         }
         currentPlanes.clear();
 

forge-game/src/main/java/forge/game/trigger/Trigger.java

@@ -121,7 +121,7 @@ public abstract class Trigger extends TriggerReplacementBase {
         this.id = nextId();
         this.intrinsic = intrinsic;
 
-        this.setRunParams(Maps.newHashMap());
+        this.setRunParams(new HashMap<String, Object>()); // TODO: Consider whether this can be null instead, for performance reasons.
         this.originalMapParams.putAll(params);
         this.mapParams.putAll(params);
         this.setHostCard(host);

forge-game/src/main/java/forge/game/zone/MagicStack.java

@@ -141,7 +141,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         if (ability.isSpell()) {
             final Card source = ability.getHostCard();
             if (!source.isCopiedSpell() && !source.isInZone(ZoneType.Stack)) {
-                ability.setHostCard(game.getAction().moveToStack(source, ability, Maps.newHashMap()));
+                ability.setHostCard(game.getAction().moveToStack(source, ability, null));
             }
         }
 

forge-gui-android/.classpath

@@ -10,15 +10,11 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

forge-gui-ios/.classpath

@@ -11,11 +11,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/forge-gui"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/forge-gui-mobile"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/forge-ai"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -27,5 +22,6 @@
 	<classpathentry kind="lib" path="/forge-gui-mobile/libs/gdx-freetype.jar"/>
 	<classpathentry kind="con" path="org.robovm.eclipse.ROBOVM_CONTAINER"/>
 	<classpathentry kind="con" path="org.robovm.eclipse.ROBOVM_COCOA_TOUCH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

forge-gui-mobile-dev/.classpath

@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="libs/gdx-backend-lwjgl-natives.jar"/>
 	<classpathentry kind="lib" path="libs/gdx-backend-lwjgl.jar" sourcepath="libs/gdx-backend-lwjgl-sources.jar"/>
 	<classpathentry kind="lib" path="libs/gdx-natives.jar"/>
@@ -20,5 +15,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

forge-gui/.classpath

@@ -3,8 +3,8 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>