From d42901d0523d72820c3c2d69dfaf83c19b7d8ca9 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 11 May 2015 13:49:04 +0200
Subject: [PATCH] Some minor changes.

---
 .../PutIntoGraveFromBattlefieldAllTriggeredAbility.java  | 9 ++++++++-
 .../mage/abilities/effects/common/ChooseColorEffect.java | 3 ++-
 .../common/continuous/BecomesColorTargetEffect.java      | 3 ++-
 .../mage/watchers/common/CastSpellLastTurnWatcher.java   | 1 -
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
index cf2e9f2727f..be6495f8c90 100644
--- a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
@@ -45,15 +45,21 @@ public class PutIntoGraveFromBattlefieldAllTriggeredAbility extends TriggeredAbi
 
     private final FilterPermanent filter;
     private boolean setTargetPointer;
+    private boolean onlyToControllerGraveyard;
 
     public PutIntoGraveFromBattlefieldAllTriggeredAbility(Effect effect, boolean optional, FilterPermanent filter, boolean setTargetPointer) {
+        this(effect, optional, filter, setTargetPointer, false);
+    }
+    public PutIntoGraveFromBattlefieldAllTriggeredAbility(Effect effect, boolean optional, FilterPermanent filter, boolean setTargetPointer, boolean onlyToControllerGraveyard) {
         super(Zone.BATTLEFIELD, effect, optional);
         this.filter = filter;
+        this.onlyToControllerGraveyard = onlyToControllerGraveyard;
     }
 
     public PutIntoGraveFromBattlefieldAllTriggeredAbility(final PutIntoGraveFromBattlefieldAllTriggeredAbility ability) {
         super(ability);
         this.filter = ability.filter;
+        this.onlyToControllerGraveyard = ability.onlyToControllerGraveyard;        
     }
 
     @Override
@@ -80,7 +86,8 @@ public class PutIntoGraveFromBattlefieldAllTriggeredAbility extends TriggeredAbi
 
     @Override
     public String getRule() {
-        return new StringBuilder("Whenever ").append(filter.getMessage()).append(" is put into a graveyard from the battlefield, ").append(super.getRule()).toString();
+        return "Whenever " + filter.getMessage() + " is put into " + (onlyToControllerGraveyard ? "your":"a") +
+                " graveyard from the battlefield, " + super.getRule();
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java b/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
index 21d0b759645..ff5d4cee3c7 100644
--- a/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ChooseColorEffect.java
@@ -63,8 +63,9 @@ public class ChooseColorEffect extends OneShotEffect {
                     return false;
                 }
             }
-            if (!game.isSimulation())
+            if (!game.isSimulation()) {
                 game.informPlayers(new StringBuilder(permanent.getLogName()).append(": ").append(controller.getLogName()).append(" has chosen ").append(choice.getChoice()).toString());
+            }
             game.getState().setValue(source.getSourceId() + "_color", choice.getColor());
             permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + choice.getColor().getDescription() + "</font>", game);
             return true;
diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
index c17456326f9..6c74ef7e58c 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
@@ -96,8 +96,9 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
             } else {
                 return false;
             }
-            if (!game.isSimulation())
+            if (!game.isSimulation()) {
                 game.informPlayers(controller.getLogName() + " has chosen the color: " + objectColor.toString());
+            }
         } else {
             objectColor = this.setColor;
         }
diff --git a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
index 6498530c682..1b22784e905 100644
--- a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
+++ b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
@@ -38,7 +38,6 @@ import mage.MageObjectReference;
 import mage.constants.WatcherScope;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.stack.Spell;
 import mage.watchers.Watcher;
 
 /**