From 6baf8cf43b28fb792c2e07507680e3ebcb182396 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 16 Apr 2013 07:20:34 +0000
Subject: [PATCH] - Cleanup.

---
 src/main/java/forge/game/GameActionUtil.java            | 2 +-
 src/main/java/forge/gui/match/controllers/CPicture.java | 2 +-
 src/main/java/forge/gui/match/views/VStack.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java
index 71c09572803..e98794ae328 100644
--- a/src/main/java/forge/game/GameActionUtil.java
+++ b/src/main/java/forge/game/GameActionUtil.java
@@ -542,7 +542,7 @@ public final class GameActionUtil {
             }
             
             else if (part instanceof CostPartMana ) {
-                if (!((CostPartMana) part).getManaToPay().equals("0")) // non-zero costs require input
+                if (!((CostPartMana) part).getManaToPay().isZero()) // non-zero costs require input
                     mayRemovePart = false; 
             } else
                 throw new RuntimeException("GameActionUtil.payCostDuringAbilityResolve - An unhandled type of cost was met: " + part.getClass());
diff --git a/src/main/java/forge/gui/match/controllers/CPicture.java b/src/main/java/forge/gui/match/controllers/CPicture.java
index 6444324dddb..9f54d53aa64 100644
--- a/src/main/java/forge/gui/match/controllers/CPicture.java
+++ b/src/main/java/forge/gui/match/controllers/CPicture.java
@@ -49,7 +49,7 @@ public enum CPicture implements ICDoc {
      */
     public void showCard(final Card c, boolean showFlipped) {
         cameFaceDown = c.isFaceDown() && c.canBeShownTo(Singletons.getControl().getPlayer());
-        canFlip = c != null && (c.isDoubleFaced() || c.isFlipCard() || cameFaceDown);
+        canFlip = c.isDoubleFaced() || c.isFlipCard() || cameFaceDown;
         currentCard = c;
         flipped = canFlip && (c.getCurState() == CardCharacteristicName.Transformed ||
                               c.getCurState() == CardCharacteristicName.Flipped || c.getCurState() == CardCharacteristicName.FaceDown); 
diff --git a/src/main/java/forge/gui/match/views/VStack.java b/src/main/java/forge/gui/match/views/VStack.java
index c5b6ad4ce2a..25213307604 100644
--- a/src/main/java/forge/gui/match/views/VStack.java
+++ b/src/main/java/forge/gui/match/views/VStack.java
@@ -186,7 +186,7 @@ public enum VStack implements IVDoc<CStack> {
             parentCell.getBody().add(tar, "w 98%!");
             stackTARs.add(tar);
 
-            if (spell != null && spell.isOptionalTrigger()) {
+            if (spell.isOptionalTrigger()) {
                 tar.addMouseListener(new MouseAdapter() {
                     @Override
                     public void mousePressed(final MouseEvent e) {