External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added additional test for prevent damage effects, improved 3358e2da80 (#6915)

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-06 21:16:59 +04:00
parent 3358e2da80
commit 2eeefd91ef
9 changed files with 137 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/main/java/mage/abilities/effects/common/continuous/DamageCantBePreventedEffect.java
View file

@ -8,6 +8,7 @@ import mage.game.Game;
import mage.game.events.GameEvent;
public class DamageCantBePreventedEffect extends ContinuousRuleModifyingEffectImpl {
public DamageCantBePreventedEffect(Duration duration, String staticText, boolean messageToUser, boolean messageToLog) {
super(duration, Outcome.Benefit, messageToUser, messageToLog);
this.staticText = staticText;

13
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -12,14 +12,7 @@ import mage.game.events.GameEvent.EventType;
import mage.players.Player;
import mage.util.RandomUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.*;
/**
* @author BetaSteward_at_googlemail.com
@ -112,9 +105,9 @@ public abstract class TargetImpl implements Target {
StringBuilder sb = new StringBuilder();
sb.append("Select ").append(targetName);
if (getMaxNumberOfTargets() > 0 && getMaxNumberOfTargets() != Integer.MAX_VALUE) {
sb.append(" (").append(targets.size()).append('/').append(getMaxNumberOfTargets()).append(')');
sb.append(" (selected ").append(targets.size()).append(" of ").append(getMaxNumberOfTargets()).append(')');
} else {
sb.append(" (").append(targets.size()).append(')');
sb.append(" (selected ").append(targets.size()).append(')');
}
sb.append(suffix);
return sb.toString();