From 009f2a85fd0e05398b95de2ad368f672b34e8830 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 30 Jul 2015 16:46:24 +0200
Subject: [PATCH] Fixed weird replacement effects showing from otehr games
 (#643).

---
 .../src/mage/player/human/HumanPlayer.java            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index 5997c368ae7..30262797d8a 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -102,19 +102,17 @@ public class HumanPlayer extends PlayerImpl {
     protected static FilterCreatureForCombat filterCreatureForCombat = new FilterCreatureForCombat();
     protected static FilterAttackingCreature filterAttack = new FilterAttackingCreature();
     protected static FilterBlockingCreature filterBlock = new FilterBlockingCreature();
-    protected static final Choice replacementEffectChoice = new ChoiceImpl(true);
+    protected final Choice replacementEffectChoice;
 
     private static final Logger log = Logger.getLogger(HumanPlayer.class);
 
-    static {
-        replacementEffectChoice.setMessage("Choose replacement effect to resolve first");
-    }
-
     protected HashSet<String> autoSelectReplacementEffects = new HashSet<>();
     protected ManaCost currentlyUnpaidMana;
 
     public HumanPlayer(String name, RangeOfInfluence range, int skill) {
         super(name, range);
+        replacementEffectChoice = new ChoiceImpl(true);
+        replacementEffectChoice.setMessage("Choose replacement effect to resolve first");
         human = true;
     }
 
@@ -122,6 +120,7 @@ public class HumanPlayer extends PlayerImpl {
         super(player);
         this.autoSelectReplacementEffects.addAll(autoSelectReplacementEffects);
         this.currentlyUnpaidMana = player.currentlyUnpaidMana;
+        this.replacementEffectChoice = player.replacementEffectChoice;
     }
 
     protected void waitForResponse(Game game) {
@@ -515,7 +514,7 @@ public class HumanPlayer extends PlayerImpl {
     public boolean chooseTargetAmount(Outcome outcome, TargetAmount target, Ability source, Game game) {
         updateGameStatePriority("chooseTargetAmount", game);
         while (!abort) {
-            game.fireSelectTargetEvent(playerId, addSecondLineWithObjectName(target.getMessage() + "\n Amount remaining:" + target.getAmountRemaining(), source.getSourceId(), game),
+            game.fireSelectTargetEvent(playerId, addSecondLineWithObjectName(target.getMessage() + "\n Amount remaining:" + target.getAmountRemaining(), source == null ? null : source.getSourceId(), game),
                     target.possibleTargets(source == null ? null : source.getSourceId(), playerId, game),
                     target.isRequired(source),
                     getOptions(target, null));