From 4834dce33adee80298851a384aa9dac433dc79a9 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 21 Jan 2014 00:45:09 +0100 Subject: [PATCH] Fixed a problem of TributeAbility. --- .../abilities/condition/common/TributeNotPaidCondition.java | 6 +++++- Mage/src/mage/abilities/keyword/TributeAbility.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Mage/src/mage/abilities/condition/common/TributeNotPaidCondition.java b/Mage/src/mage/abilities/condition/common/TributeNotPaidCondition.java index 0a4fcf4c8de..60281a17793 100644 --- a/Mage/src/mage/abilities/condition/common/TributeNotPaidCondition.java +++ b/Mage/src/mage/abilities/condition/common/TributeNotPaidCondition.java @@ -53,6 +53,10 @@ public class TributeNotPaidCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - return !(Boolean) game.getState().getValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString()); + Object tribute = game.getState().getValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString()); + if (tribute != null) { + return ((String)tribute).equals("no"); + } + return false; } } diff --git a/Mage/src/mage/abilities/keyword/TributeAbility.java b/Mage/src/mage/abilities/keyword/TributeAbility.java index 5838700511d..d60d46d617e 100644 --- a/Mage/src/mage/abilities/keyword/TributeAbility.java +++ b/Mage/src/mage/abilities/keyword/TributeAbility.java @@ -117,9 +117,9 @@ class TributeEffect extends OneShotEffect { sb.append(" (add ").append(tributeValue).append(" +1/+1 counters to it)?"); if (opponent.chooseUse(outcome, sb.toString(), game)) { sourcePermanent.addCounters(CounterType.P1P1.createInstance(tributeValue), game); - game.getState().setValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString(), Boolean.TRUE); + game.getState().setValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString(), "yes"); } else { - game.getState().setValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString(), Boolean.FALSE); + game.getState().setValue(new StringBuilder("tributeValue").append(source.getSourceId()).toString(), "no"); } return true; }