From 40e9f138061bbe7ceb2e8e712d05879a8e607037 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 27 Sep 2021 13:02:52 -0400 Subject: [PATCH] better regex --- forge-core/src/main/java/forge/util/lang/LangEnglish.java | 2 +- forge-core/src/main/java/forge/util/lang/LangGerman.java | 2 +- forge-core/src/main/java/forge/util/lang/LangItalian.java | 2 +- forge-core/src/main/java/forge/util/lang/LangSpanish.java | 2 +- forge-game/src/main/java/forge/game/card/Card.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-core/src/main/java/forge/util/lang/LangEnglish.java b/forge-core/src/main/java/forge/util/lang/LangEnglish.java index 97493a30ba7..76dbbe52039 100644 --- a/forge-core/src/main/java/forge/util/lang/LangEnglish.java +++ b/forge-core/src/main/java/forge/util/lang/LangEnglish.java @@ -32,6 +32,6 @@ public class LangEnglish extends Lang { @Override public String getNickName(final String name) { - return name.split(", ")[0]; + return name.split(" ")[0].replace(",", ""); } } diff --git a/forge-core/src/main/java/forge/util/lang/LangGerman.java b/forge-core/src/main/java/forge/util/lang/LangGerman.java index ebd289df7da..86f1bce937d 100644 --- a/forge-core/src/main/java/forge/util/lang/LangGerman.java +++ b/forge-core/src/main/java/forge/util/lang/LangGerman.java @@ -29,7 +29,7 @@ public class LangGerman extends Lang { @Override public String getNickName(final String name) { - return name.split(", ")[0]; + return name.split(" ")[0].replace(",", ""); } } diff --git a/forge-core/src/main/java/forge/util/lang/LangItalian.java b/forge-core/src/main/java/forge/util/lang/LangItalian.java index 2ac24b5c55a..47fddb1d195 100644 --- a/forge-core/src/main/java/forge/util/lang/LangItalian.java +++ b/forge-core/src/main/java/forge/util/lang/LangItalian.java @@ -25,7 +25,7 @@ public class LangItalian extends Lang { @Override public String getNickName(final String name) { - return name.split(", ")[0]; + return name.split(" ")[0].replace(",", ""); } } diff --git a/forge-core/src/main/java/forge/util/lang/LangSpanish.java b/forge-core/src/main/java/forge/util/lang/LangSpanish.java index 9ba64b29e82..45d5b6d7791 100644 --- a/forge-core/src/main/java/forge/util/lang/LangSpanish.java +++ b/forge-core/src/main/java/forge/util/lang/LangSpanish.java @@ -27,7 +27,7 @@ public class LangSpanish extends Lang { @Override public String getNickName(final String name) { - return name.split(", ")[0]; + return name.split(" ")[0].replace(",", ""); } } diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index fb562b0e1af..7172fde14ab 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -2431,7 +2431,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { String currentName = host.getName(); String desc1 = TextUtil.fastReplace(stAb.toString(), "CARDNAME", currentName); - String desc = TextUtil.fastReplace(desc1,"NICKNAME", currentName.split(",")[0]); + String desc = TextUtil.fastReplace(desc1,"NICKNAME", currentName.split(" ")[0].replace(",", "")); if (host.getEffectSource() != null) { desc = TextUtil.fastReplace(desc, "EFFECTSOURCE", host.getEffectSource().getName()); }