From 8d463f3d5ed317efecc31a83c65a4b76bbcfd656 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 7 Feb 2016 21:56:04 +0000
Subject: [PATCH] Simplify extraction of player/opponent name from card name

---
 .../java/forge/planarconquest/ConquestCommander.java  |  7 ++-----
 .../main/java/forge/planarconquest/ConquestEvent.java | 11 ++++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java b/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java
index 808fe100e8a..b06b9ede009 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java
@@ -65,13 +65,10 @@ public class ConquestCommander implements InventoryItem, IXmlWritable {
 
     public String getPlayerName() {
         String name = card.getName();
-        int idx = name.indexOf(' ');
-        if (idx != -1) {
+        int idx = name.indexOf(',');
+        if (idx != -1) { //trim everything after the comma
             name = name.substring(0, idx);
         }
-        if (name.endsWith(",") || name.endsWith("-")) {
-            name = name.substring(0, name.length() - 1).trim();
-        }
         return name;
     }
 
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java
index 9fa043442b5..6ccb71c9c9c 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java
@@ -83,6 +83,15 @@ public class ConquestEvent {
         return avatarCard;
     }
 
+    public String getOpponentName() {
+        String name = avatar;
+        int idx = name.indexOf(',');
+        if (idx != -1) { //trim everything after the comma
+            name = name.substring(0, idx);
+        }
+        return name;
+    }
+
     public ConquestBattle createBattle(ConquestLocation location0, int tier0) {
         return new ConquestEventBattle(location0, tier0);
     }
@@ -171,7 +180,7 @@ public class ConquestEvent {
 
         @Override
         public String getOpponentName() {
-            return ConquestEvent.this.getAvatar();
+            return ConquestEvent.this.getOpponentName();
         }
 
         @Override