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

initial changes, creation of branch, detailed in #4799

Browse source
This commit is contained in:
Evan Kranzler 2018-04-19 11:19:48 -04:00
parent 97b2b2feac
commit 7212b02e53
11 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -187,7 +187,12 @@ public class DamageTargetEffect extends OneShotEffect {
if (!targetDescription.isEmpty()) {
sb.append(targetDescription);
} else {
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
String targetName = mode.getTargets().get(0).getTargetName();
if (targetName.contains("any")) {
sb.append(targetName);
} else {
sb.append("target ").append(targetName);
}
}
if (!message.isEmpty()) {
if (message.equals("1")) {

11
Mage/src/main/java/mage/abilities/effects/common/PreventDamageToTargetEffect.java
View file

@ -82,11 +82,16 @@ public class PreventDamageToTargetEffect extends PreventionEffectImpl {
}
StringBuilder sb = new StringBuilder();
if (amountToPrevent == Integer.MAX_VALUE) {
sb.append("prevent all damage that would be dealt to target ");
sb.append("prevent all damage that would be dealt to ");
} else {
sb.append("prevent the next ").append(amountToPrevent).append(" damage that would be dealt to target ");
sb.append("prevent the next ").append(amountToPrevent).append(" damage that would be dealt to ");
}
String targetName = mode.getTargets().get(0).getTargetName();
if (targetName.contains("any")) {
sb.append(targetName);
} else {
sb.append("target ").append(targetName);
}
sb.append(mode.getTargets().get(0).getTargetName());
if (!duration.toString().isEmpty()) {
sb.append(' ');
if (duration == Duration.EndOfTurn) {

2
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -440,7 +440,7 @@ public abstract class PlayerImpl implements Player, Serializable {
this.canLoseLife = true;
this.topCardRevealed = false;
this.payManaMode = false;
this.setLife(game.getLife(), game, UUID.randomUUID());
this.setLife(game.getLife(), game, (UUID) null);
this.setReachedNextTurnAfterLeaving(false);
this.castSourceIdWithAlternateMana = null;