From b85587038d2b4f0b4017a264b4f06e20d2898f59 Mon Sep 17 00:00:00 2001
From: Hellfish <hellfish@cardforge.org>
Date: Sat, 4 May 2013 20:58:14 +0000
Subject: [PATCH] *Tweaked synchronized blocks

---
 src/main/java/forge/game/zone/MagicStack.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java
index 36233019884..a2c5e70a23f 100644
--- a/src/main/java/forge/game/zone/MagicStack.java
+++ b/src/main/java/forge/game/zone/MagicStack.java
@@ -944,9 +944,8 @@ public class MagicStack extends MyObservable {
         synchronized (this.stack) {
             this.getStack().remove(si);
         }
-        synchronized (this.frozenStack) {
-            this.getFrozenStack().remove(si);
-        }
+
+        this.getFrozenStack().remove(si);
         this.updateObservers();
     }
 
@@ -1110,7 +1109,9 @@ public class MagicStack extends MyObservable {
      * @return the stack
      */
     public final Stack<SpellAbilityStackInstance> getStack() {
-        return this.stack;
+        synchronized(this.stack) {
+            return this.stack;
+        }        
     }
 
     /**