From 0a8faf29f045d1a93f0f8fadb1a6ae3e85f8e6f4 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 03:43:38 +0000
Subject: [PATCH] - Permanents should be untapped when coming into play from
 Oblivion Ring. - Fixed Vitu-Ghazi, the City-Tree.

---
 src/forge/CardFactory.java       |  3 +++
 src/forge/CardFactory_Lands.java |  6 ------
 src/forge/CardListUtil.java      | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 4c379210d5e..6edb746b079 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -4007,7 +4007,10 @@ public class CardFactory implements NewConstants {
                                 PlayerZone play = AllZone.getZone(Constant.Zone.Play, c.getOwner());
                                 PlayerZone removed = AllZone.getZone(Constant.Zone.Removed_From_Play, c.getOwner());
                                 removed.remove(c);
+                                if (c.isTapped())
+                                	c.untap();
                                 play.add(c);
+                                
                             }
                         }//resolve()
                     };//SpellAbility
diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java
index c5536399e16..861dfe938fb 100644
--- a/src/forge/CardFactory_Lands.java
+++ b/src/forge/CardFactory_Lands.java
@@ -1698,12 +1698,6 @@ class CardFactory_Lands {
             final Ability_Tap ability = new Ability_Tap(card, "2 G W") {
                 private static final long serialVersionUID = 1781653158406511188L;
                 
-                @Override
-                public boolean canPlay() {
-                    if(AllZone.GameAction.isCardInPlay(card)) return true;
-                    else return false;
-                }
-                
                 @Override
                 public void resolve() {
                     CardFactoryUtil.makeToken("Saproling", "G 1 1 Saproling", card, "G", new String[] {
diff --git a/src/forge/CardListUtil.java b/src/forge/CardListUtil.java
index 17b1662d856..34987d398e5 100644
--- a/src/forge/CardListUtil.java
+++ b/src/forge/CardListUtil.java
@@ -193,6 +193,20 @@ public class CardListUtil
 	   list.sort(com);
   }
   
+  public static void sortByName(CardList list)
+  {
+	  Comparator<Card> com = new Comparator<Card>()
+	  {
+		public int compare(Card a, Card b) {
+			String aName = a.getName();
+			String bName = b.getName();
+			
+			return aName.compareTo(bName);
+		}
+		  
+	  };
+	  list.sort(com);
+  }
   
   public static void sortCMC(CardList list)
   {