From e40557888e3f17bf123128c806eaf5f8ec3b1a06 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 05:01:45 +0000
Subject: [PATCH] * cleanups

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

diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index fa9532f5198..0d3b419abc3 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -17152,10 +17152,10 @@ public class CardFactory implements NewConstants {
                         CardList DoublingSeasons = new CardList(play.getCards());
                         DoublingSeasons = DoublingSeasons.getName("Doubling Season");
                         PlayerZone_ComesIntoPlay.SimultaneousEntry = true;      
-                        double Count = DoublingSeasons.size();
-                        Count = 5 * Math.pow(2,Count);
+                        int Count = DoublingSeasons.size();
+                        Count = 5 * (int)Math.pow(2,Count);
                         for(int i = 0; i < Count; i++) {
-                        	if(i + 1== Count) PlayerZone_ComesIntoPlay.SimultaneousEntry = false;                 
+                        	if(i + 1 == Count) PlayerZone_ComesIntoPlay.SimultaneousEntry = false;                 
                         Card Copy = copyCardintoNew(getTargetCard());
                         Copy.setToken(true);
                         Copy.setController(card.getController());
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index d0a5352f675..5cf9bf05501 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -2598,7 +2598,7 @@ public class CardFactory_Creatures {
                         else PlayLand = AllZone.GameInfo.getComputerCanPlayNumberOfLands();
                         
                     return (AllZone.GameAction.isCardInZone(card, play) && library.get(0).getType().contains("Land") && PlayLand > 0) 
-                    && (AllZone.Stack.size() == 0) && AllZone.GameAction.getLastPlayerToDraw() == card.getController();
+                    && (AllZone.Stack.size() == 0) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController());
                 }
             }; 
             ability.setStackDescription(card.getController() + " - plays land from top of library.");           
diff --git a/src/forge/ComputerUtil.java b/src/forge/ComputerUtil.java
index 9e994f4d8ea..9ebee5e7d48 100644
--- a/src/forge/ComputerUtil.java
+++ b/src/forge/ComputerUtil.java
@@ -156,9 +156,8 @@ public class ComputerUtil
     {
        land.remove(sa.getSourceCard());
     }
-    ManaCost cost = new ManaCost(sa.getManaCost());
  // Beached - Delete old
-    cost = AllZone.GameAction.GetSpellCostChange(sa);
+    ManaCost cost = AllZone.GameAction.GetSpellCostChange(sa);
     if(cost.isPaid())
         return true;
  // Beached - Delete old
@@ -229,8 +228,7 @@ public class ComputerUtil
     {
        land.remove(sa.getSourceCard());
     }
-    ManaCost cost = new ManaCost(sa.getManaCost());
-    cost = AllZone.GameAction.GetSpellCostChange(sa);
+    ManaCost cost = AllZone.GameAction.GetSpellCostChange(sa);
     // Beached - Delete old
     if(cost.isPaid())
         return;
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index fbc7c342c7b..b3f34024e24 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -747,8 +747,7 @@ public class GameAction {
             PlayerZone grave = AllZone.getZone(c);
             grave.remove(c);
         	
-        	Card crd = new Card();
-        	crd = AllZone.CardFactory.getCard(c.getName(), c.getOwner());
+        	Card crd = AllZone.CardFactory.getCard(c.getName(), c.getOwner());
         	ownerPlay.add(crd);
         	
         	crd.addCounter(Counters.M1M1, 1);