Merge remote-tracking branch 'production/master' into production_master

This commit is contained in:
Oleg Agafonov 2018-01-08 00:49:45 +04:00
commit 5354cffc47

View file

@ -121,7 +121,7 @@ public class HumanPlayer extends PlayerImpl {
public HumanPlayer(final HumanPlayer player) { public HumanPlayer(final HumanPlayer player) {
super(player); super(player);
this.replacementEffectChoice = player.replacementEffectChoice; this.replacementEffectChoice = player.replacementEffectChoice;
this.autoSelectReplacementEffects.addAll(autoSelectReplacementEffects); this.autoSelectReplacementEffects.addAll(player.autoSelectReplacementEffects);
this.currentlyUnpaidMana = player.currentlyUnpaidMana; this.currentlyUnpaidMana = player.currentlyUnpaidMana;
this.triggerAutoOrderAbilityFirst.addAll(player.triggerAutoOrderAbilityFirst); this.triggerAutoOrderAbilityFirst.addAll(player.triggerAutoOrderAbilityFirst);