From 1e6ba6c6ed99d45c18dd9cf266f91d4b46bdecd4 Mon Sep 17 00:00:00 2001 From: kms70847 Date: Sat, 6 Jul 2019 16:53:37 -0400 Subject: [PATCH] Print all "enters the battlefield" replacement abilities above triggered abilities, not just "enters the battlefield tapped" specifically. --- forge-game/src/main/java/forge/game/card/Card.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 2c52dc2a270..20797fb1b74 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -1905,13 +1905,14 @@ public class Card extends GameEntity implements Comparable { } sb.append(keywordsToText(getUnhiddenKeywords(state))); - // Process replacement effects first so that ETB tabbed can be printed + // Process replacement effects first so that "enters the battlefield tapped" + // and "as ~ enters the battlefield, choose...", etc can be printed // here. The rest will be printed later. StringBuilder replacementEffects = new StringBuilder(); for (final ReplacementEffect replacementEffect : state.getReplacementEffects()) { if (!replacementEffect.isSecondary()) { String text = replacementEffect.toString(); - if (text.equals("CARDNAME enters the battlefield tapped.")) { + if (text.contains("enters the battlefield")) { sb.append(text).append("\r\n"); } else { replacementEffects.append(text).append("\r\n");