Merge branch 'etbReorder3' into 'master'

Print all "enters the battlefield" replacement abilities above triggered...

See merge request core-developers/forge!1941
This commit is contained in:
Michael Kamensky
2019-07-08 09:52:33 +00:00

View File

@@ -1905,13 +1905,14 @@ public class Card extends GameEntity implements Comparable<Card> {
}
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");