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

Merge remote-tracking branch 'origin/master' into code-cleanup

Browse Source
This commit is contained in:
Jetz
2024-11-13 09:17:45 -05:00
parent d81c5a40cf 9435ca6edc
commit e879abca85
13 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java
View File

@@ -86,10 +86,7 @@ public class CCombat implements ICDoc {
else
display.append(Lang.getInstance().getPossesive(controller.getName())).append(" ");
}
if (controller == null)
display.append(" is attacked by:\n");
else
display.append(defender).append(" is attacked by:\n");
display.append(defender).append(" is attacked by:\n");
// Associate Bands, Attackers Blockers
boolean previousBand = false;