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

Merge branch 'etbReorder3' into 'master'

Browse Source 
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
parent eeb8b7bc6c 1e6ba6c6ed
commit 2ec04c1a83
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1905,13 +1905,14 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
sb.append(keywordsToText(getUnhiddenKeywords(state))); 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. // here. The rest will be printed later.
StringBuilder replacementEffects = new StringBuilder(); StringBuilder replacementEffects = new StringBuilder();
for (final ReplacementEffect replacementEffect : state.getReplacementEffects()) { for (final ReplacementEffect replacementEffect : state.getReplacementEffects()) {
if (!replacementEffect.isSecondary()) { if (!replacementEffect.isSecondary()) {
String text = replacementEffect.toString(); String text = replacementEffect.toString();
if (text.equals("CARDNAME enters the battlefield tapped.")) { if (text.contains("enters the battlefield")) {
sb.append(text).append("\r\n"); sb.append(text).append("\r\n");
} else { } else {
replacementEffects.append(text).append("\r\n"); replacementEffects.append(text).append("\r\n");