github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Prevent all damage - fixed text;

Browse source
This commit is contained in:
Oleg Agafonov 2020-02-06 21:26:52 +04:00
parent 1cbabacc23
commit dc43707a4d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
View file

@ -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();