From 55966f3056bf808e8aa14df8a59a6ebdbc805883 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 12 Jul 2015 19:49:53 +0200 Subject: [PATCH] * Fixes to spend any mana to pay handling- --- .../Mage.Player.Human/src/mage/player/human/HumanPlayer.java | 2 +- Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java | 4 ++-- Mage/src/mage/abilities/costs/mana/ManaCostImpl.java | 2 +- Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java | 2 +- Mage/src/mage/players/Player.java | 2 +- 5 files changed, 6 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 0b26b8ea235..7e1a819fa46 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 @@ -674,7 +674,7 @@ public class HumanPlayer extends PlayerImpl { } @Override - public boolean playMana(ManaCost unpaid, String promptText, Game game) { + public boolean playMana(Ability ability, ManaCost unpaid, String promptText, Game game) { payManaMode = true; boolean result = playManaHandling(unpaid, promptText, game); payManaMode = false; diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index adb8160badd..683c11da3e7 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -1826,8 +1826,8 @@ public class TestPlayer implements Player { } @Override - public boolean playMana(ManaCost unpaid, String promptText, Game game) { - return computerPlayer.playMana(unpaid, promptText, game); + public boolean playMana(Ability ability, ManaCost unpaid, String promptText, Game game) { + return computerPlayer.playMana(ability, unpaid, promptText, game); } @Override diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java index 60e9fcb22d1..c33e0f5799b 100644 --- a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java @@ -219,7 +219,7 @@ public abstract class ManaCostImpl extends CostImpl implements ManaCost { while (!isPaid()) { ManaCost unpaid = this.getUnpaid(); String promptText = ManaUtil.addSpecialManaPayAbilities(ability, game, unpaid); - if (player.playMana(unpaid, promptText, game)) { + if (player.playMana(ability, unpaid, promptText, game)) { assignPayment(game, ability, player.getManaPool()); } else { return false; diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java index 02e6f4682ba..c6d7654244a 100644 --- a/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/mage/abilities/costs/mana/ManaCostsImpl.java @@ -131,7 +131,7 @@ public class ManaCostsImpl extends ArrayList implements M while (!isPaid()) { ManaCost unpaid = this.getUnpaid(); String promptText = ManaUtil.addSpecialManaPayAbilities(ability, game, unpaid); - if (player.playMana(unpaid, promptText, game)) { + if (player.playMana(ability, unpaid, promptText, game)) { assignPayment(game, ability, player.getManaPool()); } else { return false; diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java index d9b3a914f70..d242c5a49de 100644 --- a/Mage/src/mage/players/Player.java +++ b/Mage/src/mage/players/Player.java @@ -445,7 +445,7 @@ public interface Player extends MageItem, Copyable { boolean choosePile(Outcome outcome, String message, List pile1, List pile2, Game game); - boolean playMana(ManaCost unpaid, String promptText, Game game); + boolean playMana(Ability ability, ManaCost unpaid, String promptText, Game game); /** * Moves the cards from cards to the bottom of the players library.