From f47870a698b826c5018c93b025be391ca3676599 Mon Sep 17 00:00:00 2001 From: kevlahnota Date: Sat, 9 Nov 2024 06:34:47 +0800 Subject: [PATCH] Update CCombat.java - closes #6548 --- .../main/java/forge/screens/match/controllers/CCombat.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java index 37d614e3153..750d7403a42 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CCombat.java @@ -87,10 +87,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;