Revert "edge case fix, the issue arises from castcard but I'm fixing it at a higher level since init to zone should always have a valid "player 1" in its first constructor."

This reverts commit d247c53136.

projects/mtg/bin/Res/player/premade/deck1.txt

@@ -1,7 +1,19 @@
 #NAME:Premade G/R
 #DESC:A Red/Green deck with simple mechanics to get you started. We recommend you create your own decks to get the full Wagic experience!
 
-arbor elf *25
+Forest (10E) *11
+Mountain (10E) *12
+
+Aggressive Urge (10E) *4
+Wall of Wood (10E) *4
+Llanowar Elves (10E) *4
+Mirri, Cat Warrior (10E)
+Scion of the Wild (10E) *4
+Primal Rage (10E) *2
+
+Lightning Elemental (10E) *4
+Shock (10E) *4
+Firebreathing (10E) *2
+Raging Goblin (10E) *4
+Anaba Bodyguard (10E) *4
 
-Arbiter of Knollridge *13
-Arbor Colossus *13

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -4288,15 +4288,20 @@ toughness=5
 [/card]
 [card]
 name=Arbor Colossus
-auto=draw:2
+abilities=reach
-type=instant
+auto=this(cantargetcard(*[-monstrous]) {3}{G}{G}{G}:becomes(monstrous) forever && counter(1/1,3) && transforms((,newAbility[destroy target(creature[flying]|opponentbattlefield)])) forever
+text=Reach -- {3}{G}{G}{G}: Monstrosity 3. (If this creature isn't monstrous, put three +1/+1 counters on it and it becomes monstrous.) -- When Arbor Colossus becomes monstrous, destroy target creature with flying an opponent controls
+mana={2}{G}{G}{G}
+type=Creature
+subtype=Giant
+power=6
+toughness=6
 [/card]
 [card]
 name=Arbor Elf
-autohand={0}:name(Control Magic) activate castcard(normal named!:Control Magic:!)
+auto={t}:untap target(forest)
 text={T}: Untap target Forest.
-mana={g}
+mana={G}
-dredge=dredge(2)
 type=Creature
 subtype=Elf Druid
 power=1

projects/mtg/bin/Res/test/_tests.txt

@@ -1,4 +1,3 @@
-savor the moment.txt
 ########################
 #Internal tests
 ########################

projects/mtg/src/MTGGameZones.cpp

@@ -980,11 +980,7 @@ void MTGInPlay::untapAll()
 
 MTGGameZone * MTGGameZone::intToZone(int zoneId, Player * p, Player * p2)
 {
-    if (p2 != p && p2 && (p != p2->opponent()))
+
-    {
-        p = p2->opponent();
-        //these cases are generally handled this is a edge case fix.
-    }
     switch (zoneId)
     {
     case MY_GRAVEYARD: