diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index 2c5723479a4..b74ea92cf50 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -92,16 +92,6 @@ public class CardProperty { } } } - } else if (property.startsWith("DifferentName_")) { - Set names = Sets.newHashSet(); - for (final Card c : CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), property.substring(14), - sourceController, source, spellAbility)) { - names.add(c.getName()); - } - if (names.contains(card.getName())) { - return false; - } - } else if (property.startsWith("BorderColor")) { if (!property.toUpperCase().contains(card.borderColor().toString())) { return false; @@ -960,6 +950,10 @@ public class CardProperty { } } return list.isEmpty(); + } else { + CardCollection list = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), restriction, + sourceController, source, spellAbility); + return !Iterables.any(list, CardPredicates.sharesNameWith(card)); } } } else if (property.startsWith("sharesControllerWith")) {