external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved add to game log out of 3 branches of if-else

Browse Source
This commit is contained in:
Maxmtg
2013-03-25 19:26:35 +00:00
parent 50bd7d43c9
commit a82abd077c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/game/zone/MagicStack.java
View File

@@ -694,17 +694,18 @@ public class MagicStack extends MyObservable {
final Card source = sa.getSourceCard(); final Card source = sa.getSourceCard();
curResolvingCard = source; 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? // TODO: Spell fizzles, what's the best way to alert player?
Log.debug(source.getName() + " ability fizzles."); Log.debug(source.getName() + " ability fizzles.");
game.getGameLog().add("ResolveStack", source.getName() + " ability fizzles.", 2);
this.finishResolving(sa, true); this.finishResolving(sa, true);
} else if (sa.getApi() != null) { } else if (sa.getApi() != null) {
game.getGameLog().add("ResolveStack", sa.getStackDescription(), 2);
AbilityUtils.handleRemembering(sa); AbilityUtils.handleRemembering(sa);
AbilityUtils.resolve(sa, true); AbilityUtils.resolve(sa, true);
} else { } else {
game.getGameLog().add("ResolveStack", sa.getStackDescription(), 2);
sa.resolve(); sa.resolve();
this.finishResolving(sa, false); this.finishResolving(sa, false);
// do creatures ETB from here? // do creatures ETB from here?