From 64c5081c69fe062d81176ddef63227a52ee6fa5a Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 04:51:18 +0000
Subject: [PATCH] * cleanups

---
 src/forge/CardFactory.java           | 2 +-
 src/forge/CardFactory_Creatures.java | 4 ++--
 src/forge/ManaPool.java              | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index fda883c0243..85a3efad1b9 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -15672,7 +15672,7 @@ public class CardFactory implements NewConstants {
                 public boolean canPlay() {
                     PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
                     
-                    return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw() == card.getController();                   
+                    return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController());                   
                 }
                 
             };
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 3019a762137..fa9777f5509 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -10819,7 +10819,7 @@ public class CardFactory_Creatures {
                     PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
                     PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController());
                     
-                    return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw() == card.getController() && hand.size() > 0;                   
+                    return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController()) && hand.size() > 0;                   
                 }
                 
             };
@@ -10852,7 +10852,7 @@ public class CardFactory_Creatures {
                     PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
                     PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController());
                     
-                    return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw() == card.getController() && hand.size() > 0;                   
+                    return AllZone.GameAction.isCardInZone(card, grave) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController()) && hand.size() > 0;                   
                 }
                 
             };
diff --git a/src/forge/ManaPool.java b/src/forge/ManaPool.java
index 3b9815da758..67e0d8d698b 100644
--- a/src/forge/ManaPool.java
+++ b/src/forge/ManaPool.java
@@ -484,18 +484,17 @@ public class ManaPool extends Card {
         PlayerZone play = AllZone.getZone(Constant.Zone.Play, Constant.Player.Human);                   
         Omnath_Human.addAll(play.getCards());
         Omnath_Human = Omnath_Human.getName("Omnath, Locus of Mana"); 
-        String New_ManaPool = "";
+        StringBuffer New_ManaPool = new StringBuffer();
         if(Omnath_Human.size() > 0) {
 	        String Human_ManaPool = has;
 	        int Count = Human_ManaPool.length();
             for(int i = 0; i < Count; i++) {          	
             	if(Human_ManaPool.contains("G") == true) {
             		Human_ManaPool = Human_ManaPool.replaceFirst("G", "");
-            		New_ManaPool = New_ManaPool + "G";
+            		New_ManaPool.append("G");
             	}
             }
-    		New_ManaPool = New_ManaPool.trim();
-            has = New_ManaPool;
+            has = New_ManaPool.toString().trim();
           //Omnath, Locus of Mana Mana Storage
         } else {
             has = "";//Arrays.fill(has, 0);