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

Merge branch 'master' into 'master'

Browse Source 
Improve clarity of code a little by inverting the condition check in GameState

See merge request core-developers/forge!3880
This commit is contained in:
Michael Kamensky
2021-02-17 05:00:23 +00:00
parent bfd743cd88 c7f8c1c59e
commit 9dcfedc13c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -262,11 +262,12 @@ public abstract class GameState {
if (c.getPaperCard() == null) { if (c.getPaperCard() == null) {
return; return;
} }
if (c.getMergedCards().isEmpty()) {
newText.append(c.getPaperCard().getName()); if (!c.getMergedCards().isEmpty()) {
} else {
// we have to go by the current top card name here // we have to go by the current top card name here
newText.append(c.getTopMergedCard().getPaperCard().getName()); newText.append(c.getTopMergedCard().getPaperCard().getName());
} else {
newText.append(c.getPaperCard().getName());
} }
} }
if (c.isCommander()) { if (c.isCommander()) {