From e64b5fb67c07d54f1f83f9f3c3437f61e5d73b61 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 23 Sep 2014 17:20:28 +0200 Subject: [PATCH] * Changes for getting correct name of object. --- Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java | 2 +- Mage/src/mage/abilities/AbilityImpl.java | 2 +- Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java | 2 +- Mage/src/mage/abilities/effects/common/DoIfCostPaid.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java index c22bb699b45..f069be6aef1 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java @@ -127,7 +127,7 @@ class DoUnlessTargetPaysCost extends OneShotEffect { if (message == null) { message = new StringBuilder(getCostText()).append(" to prevent ").append(executingEffect.getText(source.getModes().getMode())).append("?").toString(); } - message = CardUtil.replaceSourceName(message, mageObject.getName()); + message = CardUtil.replaceSourceName(message, mageObject.getLogName()); cost.clearPaid(); if (cost.canPay(source, source.getSourceId(), player.getId(), game) && player.chooseUse(executingEffect.getOutcome(), message, game)) { cost.pay(source, game, source.getSourceId(), player.getId(), false); diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index 29f081b29f8..3f9e63dde0c 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -816,7 +816,7 @@ public abstract class AbilityImpl implements Ability { logger.warn("Could get no object: " + this.toString()); } return new StringBuilder(" activates: ") - .append(object != null ? this.formatRule(modes.getText(), object.getName()) :modes.getText()) + .append(object != null ? this.formatRule(modes.getText(), object.getLogName()) :modes.getText()) .append(" from ") .append(getMessageText(game)).toString(); } diff --git a/Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java b/Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java index c24c2d0ee5f..16b615a1b6d 100644 --- a/Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java +++ b/Mage/src/mage/abilities/effects/common/DoIfClashWonEffect.java @@ -77,7 +77,7 @@ public class DoIfClashWonEffect extends OneShotEffect { String message = null; if (chooseUseText != null) { message = chooseUseText; - message = CardUtil.replaceSourceName(message, mageObject.getName()); + message = CardUtil.replaceSourceName(message, mageObject.getLogName()); } if (chooseUseText == null || player.chooseUse(executingEffect.getOutcome(), message, game)) { diff --git a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java index b83aaa892b0..06f6d175afe 100644 --- a/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java +++ b/Mage/src/mage/abilities/effects/common/DoIfCostPaid.java @@ -52,7 +52,7 @@ public class DoIfCostPaid extends OneShotEffect { } else { message = chooseUseText; } - message = CardUtil.replaceSourceName(message, mageObject.getName()); + message = CardUtil.replaceSourceName(message, mageObject.getLogName()); boolean result = true; if (cost.canPay(source, source.getSourceId(), player.getId(), game) && player.chooseUse(executingEffects.get(0).getOutcome(), message, game)) { cost.clearPaid();