Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

refactored Player.setLife() to include source, some more changes

Browse source
This commit is contained in:
Evan Kranzler 2018-04-18 21:14:05 -04:00
parent 2205db105f
commit 3c2a8ee17d
41 changed files with 120 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/effects/common/ExchangeLifeTargetEffect.java
View file

@ -77,8 +77,8 @@ public class ExchangeLifeTargetEffect extends OneShotEffect {
return false;
}
controller.setLife(lifePlayer, game);
player.setLife(lifeController, game);
controller.setLife(lifePlayer, game, source);
player.setLife(lifeController, game, source);
return true;
}
return false;

4
Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeAllEffect.java
View file

@ -62,7 +62,7 @@ public class SetPlayerLifeAllEffect extends OneShotEffect {
for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.setLife(amount.calculate(game, source, this), game);
player.setLife(amount.calculate(game, source, this), game, source);
}
}
break;
@ -70,7 +70,7 @@ public class SetPlayerLifeAllEffect extends OneShotEffect {
for (UUID playerId : game.getOpponents(controller.getId())) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.setLife(amount.calculate(game, source, this), game);
player.setLife(amount.calculate(game, source, this), game, source);
}
}
break;

2
Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeSourceEffect.java
View file

@ -45,7 +45,7 @@ public class SetPlayerLifeSourceEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
player.setLife(amount.calculate(game, source, this), game);
player.setLife(amount.calculate(game, source, this), game, source);
return true;
}
return false;

2
Mage/src/main/java/mage/abilities/effects/common/SetPlayerLifeTargetEffect.java
View file

@ -67,7 +67,7 @@ public class SetPlayerLifeTargetEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (player != null) {
player.setLife(amount.calculate(game, source, this), game);
player.setLife(amount.calculate(game, source, this), game, source);
return true;
}
return false;