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

Merge branch 'master' into CrypticSpire

Browse Source
This commit is contained in:
kevlahnota
2024-11-16 17:14:51 +08:00
committed by GitHub
parent dcd4fac927 c11ca5d3fb
commit b5f96ab8e2
31 changed files with 141 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,9 +78,8 @@ public class CCombat implements ICDoc {
}
display.append("\n");
PlayerView controller = null;
if (defender instanceof CardView) {
controller = ((CardView) defender).getController();
PlayerView controller = ((CardView) defender).getController();
if (controller == null)
//shouldn't be null but display card's + controller ie Black Knight's controller
display.append(Lang.getInstance().getPossesive(defender.getName())).append(" controller");