From dc43707a4dc986aae8e73b30da9addfd7d353c0e Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Thu, 6 Feb 2020 21:26:52 +0400
Subject: [PATCH] * Prevent all damage - fixed text;

---
 .../effects/common/PreventAllDamageToAllEffect.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
index b0d619a381e..bae8c27c9c7 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
@@ -12,6 +12,7 @@ import mage.filter.predicate.permanent.PermanentIdPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
+import java.util.Collections;
 import java.util.UUID;
 
 /**
@@ -49,10 +50,14 @@ public class PreventAllDamageToAllEffect extends PreventionEffectImpl {
     }
 
     private static FilterPermanentOrPlayer createFilter(FilterPermanent filterPermanent, FilterPlayer filterPlayer) {
-        String message = String.join(
-                " and ",
-                filterPermanent != null ? filterPermanent.getMessage() : "",
-                filterPlayer != null ? filterPlayer.getMessage() : "");
+        String mes1 = filterPermanent != null ? filterPermanent.getMessage() : "";
+        String mes2 = filterPlayer != null ? filterPlayer.getMessage() : "";
+        String message;
+        if (!mes1.isEmpty() && !mes2.isEmpty()) {
+            message = mes1 + " and " + mes2;
+        } else {
+            message = mes1 + mes2;
+        }
         FilterPermanent filter1 = filterPermanent;
         if (filter1 == null) {
             filter1 = new FilterPermanent();