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

Refactor: move player.damage params to default (same as permanent.damage);

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-14 09:15:33 +04:00
parent 76387057b7
commit 11976b5c89
228 changed files with 1104 additions and 1454 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/main/java/mage/abilities/effects/common/DamagePlayersEffect.java
View file

@ -1,18 +1,17 @@
package mage.abilities.effects.common;
import java.util.UUID;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.game.Game;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class DamagePlayersEffect extends OneShotEffect {
@ -58,18 +57,18 @@ public class DamagePlayersEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
switch (controller) {
case ANY:
for (UUID playerId: game.getState().getPlayersInRange(source.getControllerId(), game)) {
for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true);
player.damage(amount.calculate(game, source, this), source.getSourceId(), game);
}
}
break;
case OPPONENT:
for (UUID playerId: game.getOpponents(source.getControllerId())) {
for (UUID playerId : game.getOpponents(source.getControllerId())) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, true);
player.damage(amount.calculate(game, source, this), source.getSourceId(), game);
}
}
break;
@ -84,8 +83,7 @@ public class DamagePlayersEffect extends OneShotEffect {
return new DamagePlayersEffect(this);
}
private void setText()
{
private void setText() {
StringBuilder sb = new StringBuilder().append(this.sourceName).append(" deals ").append(amount.toString());
switch (controller) {
case ANY: