Merge upstream/master into animal-boneyard-and-more

Mage.Common/src/mage/view/PlayerView.java

@@ -94,7 +94,7 @@ public class PlayerView implements Serializable {
 
         this.hasLeft = player.hasLeft();
         for (Card card: player.getGraveyard().getCards(game)) {
-            graveyard.put(card.getId(), new CardView(card));
+            graveyard.put(card.getId(), new CardView(card, game, card.getId(), false));
         }
         for (ExileZone exileZone : game.getExile().getExileZones()) {
             for (Card card : exileZone.getCards(game)) {

Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java

@@ -82,6 +82,7 @@ import mage.cards.repository.CardRepository;
 import mage.cards.repository.ExpansionInfo;
 import mage.cards.repository.ExpansionRepository;
 import mage.choices.Choice;
+import mage.choices.ChoiceColor;
 import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
 import mage.constants.Outcome;
@@ -166,6 +167,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
     private transient List<PickedCard> pickedCards;
     private transient List<ColoredManaSymbol> chosenColors;
 
+    private transient ManaCost currentUnpaidMana;
     public ComputerPlayer(String name, RangeOfInfluence range) {
         super(name, range);
         human = false;
@@ -1091,7 +1093,9 @@ public class ComputerPlayer extends PlayerImpl implements Player {
     @Override
     public boolean playMana(ManaCost unpaid, String promptText, Game game) {
         payManaMode = true;
+        currentUnpaidMana = unpaid;        
         boolean result = playManaHandling(unpaid, game);
+        currentUnpaidMana = null;        
         payManaMode = false;
         return result;
     }
@@ -1275,6 +1279,30 @@ public class ComputerPlayer extends PlayerImpl implements Player {
         if (choice.getMessage() != null && choice.getMessage().equals("Choose creature type")) {
             chooseCreatureType(outcome, choice, game);
         }
+        // choose the correct color to pay a spell
+        if(outcome.equals(Outcome.PutManaInPool) && choice instanceof ChoiceColor && currentUnpaidMana != null) {
+            if (currentUnpaidMana.containsColor(ColoredManaSymbol.W) && choice.getChoices().contains("White")) {
+                choice.setChoice("White");
+                return true;
+            }
+            if (currentUnpaidMana.containsColor(ColoredManaSymbol.R) && choice.getChoices().contains("Red")) {
+                choice.setChoice("Red");
+                return true;
+            }
+            if (currentUnpaidMana.containsColor(ColoredManaSymbol.G) && choice.getChoices().contains("Green")) {
+                choice.setChoice("Green");
+                return true;
+            }
+            if (currentUnpaidMana.containsColor(ColoredManaSymbol.U) && choice.getChoices().contains("Blue")) {
+                choice.setChoice("Blue");
+                return true;
+            }
+            if (currentUnpaidMana.containsColor(ColoredManaSymbol.B) && choice.getChoices().contains("Black")) {
+                choice.setChoice("Black");
+                return true;
+            }
+        }
+        // choose by random
         if (!choice.isChosen()) {
             int choiceIdx = (int) (Math.random()*choice.getChoices().size()+1);
             for (String next : choice.getChoices()) {
@@ -1349,10 +1377,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
     public boolean chooseTarget(Outcome outcome, Cards cards, TargetCard target, Ability source, Game game)  {
         log.debug("chooseTarget");
         if (cards == null || cards.isEmpty()) {
-            if (!target.isRequired(source)) {
-                return false;
-            }
-            return true;
+            return target.isRequired(source);
         }
 
         ArrayList<Card> cardChoices = new ArrayList<>(cards.getCards(target.getFilter(), game));
@@ -1812,7 +1837,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             log.debug("[DEBUG] AI picked: " + bestCard.getName() + ", score=" + maxScore + ", deck colors=" + colors);
             draft.addPick(playerId, bestCard.getId(), null);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.debug("Exception during AI pick card for draft playerId= " +getId());
             draft.addPick(playerId, cards.get(0).getId(), null);
         }
     }

Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java

@@ -29,21 +29,28 @@
 package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
+import mage.MageObjectReference;
 
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.abilities.Ability;
+import mage.abilities.DelayedTriggeredAbility;
 import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.ReturnFromExileEffect;
+import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.cards.Card;
 import mage.cards.CardImpl;
+import mage.constants.Duration;
 import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.game.ExileZone;
 import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
+import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
 import mage.target.targetpointer.FixedTarget;
 
@@ -56,7 +63,7 @@ public class OtherworldlyJourney extends CardImpl {
         super(ownerId, 37, "Otherworldly Journey", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}");
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
-        this.color.setWhite(true);
+        
         // Exile target creature. At the beginning of the next end step, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
         this.getSpellAbility().addEffect(new OtherworldlyJourneyEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
@@ -94,16 +101,16 @@ class OtherworldlyJourneyEffect extends OneShotEffect {
                 ExileZone exile = game.getExile().getExileZone(source.getSourceId());
                 // only if permanent is in exile (tokens would be stop to exist)
                 if (exile != null && !exile.isEmpty()) {
-                    //create delayed triggered ability
-                    AtTheBeginOfNextEndStepDelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(
-                            new ReturnFromExileEffect(source.getSourceId(), Zone.BATTLEFIELD, "return that card to the battlefield under its owner's control with a +1/+1 counter on it"));
-                    delayedAbility.setSourceId(source.getSourceId());
-                    delayedAbility.setControllerId(source.getControllerId());
-                    delayedAbility.setSourceObject(source.getSourceObject(game), game);
-                    AddCountersTargetEffect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance());
-                    effect.setTargetPointer(new FixedTarget(source.getFirstTarget()));
-                    delayedAbility.addEffect(effect);
-                    game.addDelayedTriggeredAbility(delayedAbility);
+                    Card card = game.getCard(permanent.getId());
+                    if (card != null) {
+                        //create delayed triggered ability
+                        DelayedTriggeredAbility delayedAbility = 
+                                new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new OtherworldlyJourneyReturnFromExileEffect(new MageObjectReference(card, game)));
+                        delayedAbility.setSourceId(source.getSourceId());
+                        delayedAbility.setControllerId(source.getControllerId());
+                        delayedAbility.setSourceObject(source.getSourceObject(game), game);
+                        game.addDelayedTriggeredAbility(delayedAbility);                    
+                    }
                 }
                 return true;
             }
@@ -117,3 +124,83 @@ class OtherworldlyJourneyEffect extends OneShotEffect {
     }
 
 }
+
+class OtherworldlyJourneyReturnFromExileEffect extends OneShotEffect {
+
+    MageObjectReference objectToReturn;
+    public OtherworldlyJourneyReturnFromExileEffect(MageObjectReference objectToReturn) {
+        super(Outcome.PutCardInPlay);
+        this.objectToReturn = objectToReturn;
+        staticText = "return that card to the battlefield under its owner's control with a +1/+1 counter on it";
+    }
+
+    public OtherworldlyJourneyReturnFromExileEffect(final OtherworldlyJourneyReturnFromExileEffect effect) {
+        super(effect);
+        this.objectToReturn = effect.objectToReturn;
+    }
+
+    @Override
+    public OtherworldlyJourneyReturnFromExileEffect copy() {
+        return new OtherworldlyJourneyReturnFromExileEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            Card card = game.getCard(objectToReturn.getSourceId());
+            if (card != null && objectToReturn.refersTo(card, game)) {
+                game.addEffect(new OtherworldlyJourneyEntersBattlefieldEffect(objectToReturn), source);                
+                controller.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId());
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
+
+class OtherworldlyJourneyEntersBattlefieldEffect extends ReplacementEffectImpl {
+    
+    MageObjectReference objectToReturn;
+    
+    public OtherworldlyJourneyEntersBattlefieldEffect(MageObjectReference objectToReturn) {
+        super(Duration.Custom, Outcome.BoostCreature);
+        this.objectToReturn = objectToReturn;
+        staticText = "that card returns to the battlefield with a +1/+1 counter on it";
+    }
+
+    public OtherworldlyJourneyEntersBattlefieldEffect(OtherworldlyJourneyEntersBattlefieldEffect effect) {
+        super(effect);
+        this.objectToReturn = effect.objectToReturn;
+    }
+
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return EventType.ENTERS_THE_BATTLEFIELD.equals(event.getType());
+    }
+
+    @Override
+    public boolean applies(GameEvent event, Ability source, Game game) {
+        if (event.getType() == EventType.ENTERS_THE_BATTLEFIELD) {
+            return event.getTargetId().equals(objectToReturn.getSourceId());
+        }
+        return false;
+    }
+
+    @Override
+    public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+        Permanent permanent = game.getPermanent(event.getTargetId());
+        if (permanent != null) {
+            permanent.addCounters(CounterType.P1P1.createInstance(), game);
+            discard(); // use only once
+        }
+        return false;
+    }
+
+    @Override
+    public OtherworldlyJourneyEntersBattlefieldEffect copy() {
+        return new OtherworldlyJourneyEntersBattlefieldEffect(this);
+    }
+
+}

Mage.Sets/src/mage/sets/classicsixthedition/AEtherFlash.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Abduction.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AbyssalHunter.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AbyssalSpecter.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AdarkarWastes.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AgonizingMemories.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AirElemental.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AladdinsRing.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AmberPrison.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AnabaBodyguard.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AnabaShaman.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AncestralMemories.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AnimateWall.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AnkhOfMishra.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Archangel.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 import mage.constants.Rarity;

Mage.Sets/src/mage/sets/classicsixthedition/ArdentMilitia.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Armageddon.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/ArmoredPegasus.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AshenPowder.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/AshnodsAltar.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BalduvianBarbarians.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BalduvianHorde.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BirdsOfParadise.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Blaze.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Blight.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BlightedShaman.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BloodPet.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BogImp.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BogRats.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BogWraith.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Boil.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Boomerang.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/BottleOfSuleiman.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Browse.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Brushland.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Burrowing.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CallOfTheWild.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Castle.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CatWarriors.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CharcoalDiamond.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Chill.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlack.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionBlue.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionGreen.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionRed.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CircleOfProtectionWhite.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CityOfBrass.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Coercion.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Conquer.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Counterspell.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CreepingMold.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CrimsonHellkite.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Crusade.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CrystalRod.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CrystalVein.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/CursedTotem.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DAvenantArcher.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DancingScimitar.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 import mage.constants.Rarity;

Mage.Sets/src/mage/sets/classicsixthedition/DarajaGriffin.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DaringApprentice.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Deflection.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DenseFoliage.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Derelor.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Desertion.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DiminishingReturns.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DingusEgg.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Disenchant.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DisruptingScepter.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DivineTransformation.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Doomsday.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DragonEngine.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DragonMask.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DreadOfNight.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DreamCache.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DrudgeSkeletons.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DrySpell.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/DwarvenRuins.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/EarlyHarvest.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Earthquake.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/EbonStronghold.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/EkunduGriffin.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/ElderDruid.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/ElvenCache.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/ElvenRiders.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/ElvishArchers.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Enfeeblement.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/EnlightenedTutor.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/EtherealChampion.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/EvilEyeOfOrmsByGore.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Exile.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/FallenAngel.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/FallowEarth.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/FamiliarGround.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/FatalBlow.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/Fear.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/FeastOfTheUnicorn.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;
 

Mage.Sets/src/mage/sets/classicsixthedition/FemerefArchers.java

@@ -25,7 +25,7 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.sets.sixthedition;
+package mage.sets.classicsixthedition;
 
 import java.util.UUID;