From a82abd077c043c7d9e5cd4ac82738bd5f12b0973 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 25 Mar 2013 19:26:35 +0000 Subject: [PATCH] moved add to game log out of 3 branches of if-else --- src/main/java/forge/game/zone/MagicStack.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java index 79039e97003..9dd58156ddf 100644 --- a/src/main/java/forge/game/zone/MagicStack.java +++ b/src/main/java/forge/game/zone/MagicStack.java @@ -694,17 +694,18 @@ public class MagicStack extends MyObservable { final Card source = sa.getSourceCard(); curResolvingCard = source; - if (this.hasFizzled(sa, source, false)) { // Fizzle + + boolean thisHasFizzled = this.hasFizzled(sa, source, false); + String messageForLog = thisHasFizzled ? source.getName() + " ability fizzles." : sa.getStackDescription(); + game.getGameLog().add("ResolveStack", messageForLog, 2); + if (thisHasFizzled) { // Fizzle // TODO: Spell fizzles, what's the best way to alert player? Log.debug(source.getName() + " ability fizzles."); - game.getGameLog().add("ResolveStack", source.getName() + " ability fizzles.", 2); this.finishResolving(sa, true); } else if (sa.getApi() != null) { - game.getGameLog().add("ResolveStack", sa.getStackDescription(), 2); AbilityUtils.handleRemembering(sa); AbilityUtils.resolve(sa, true); } else { - game.getGameLog().add("ResolveStack", sa.getStackDescription(), 2); sa.resolve(); this.finishResolving(sa, false); // do creatures ETB from here?