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

Text and coding style fixes from review

Browse source
This commit is contained in:
LoneFox 2015-08-03 20:00:36 +03:00
parent 96bbe01aae
commit c1db04812d
5 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java
View file

@ -15,7 +15,7 @@ public class DomainValue implements DynamicValue {
private Integer amount;
private boolean countTargetPlayer;
private UUID player;
private UUID playerId;
public DomainValue() {
this(1);
@ -34,15 +34,15 @@ public class DomainValue implements DynamicValue {
this.countTargetPlayer = countTargetPlayer;
}
public DomainValue(Integer amount, UUID player) {
public DomainValue(Integer amount, UUID playerId) {
this(amount, false);
this.player = player;
this.playerId = playerId;
}
public DomainValue(final DomainValue dynamicValue) {
this.amount = dynamicValue.amount;
this.countTargetPlayer = dynamicValue.countTargetPlayer;
this.player = dynamicValue.player;
this.playerId = dynamicValue.playerId;
}
@Override
@ -53,8 +53,8 @@ public class DomainValue implements DynamicValue {
int haveSwamps = 0;
int haveForests = 0;
UUID targetPlayer;
if(player != null) {
targetPlayer = player;
if(playerId != null) {
targetPlayer = playerId;
}
else if(countTargetPlayer) {
targetPlayer = sourceAbility.getTargets().getFirstTarget();