forked from External/mage
cleanup access to fields in AbilityImpl
where trivially possible, make private and use getters
This commit is contained in:
parent
4bef01901d
commit
a768a4dd8a
23 changed files with 53 additions and 53 deletions
|
|
@ -238,11 +238,11 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa
|
|||
|
||||
protected ActivationInfo getActivationInfo(Game game) {
|
||||
Integer turnNum = (Integer) game.getState()
|
||||
.getValue(CardUtil.getCardZoneString("activationsTurn" + originalId, sourceId, game));
|
||||
.getValue(CardUtil.getCardZoneString("activationsTurn" + getOriginalId(), sourceId, game));
|
||||
Integer activationCount = (Integer) game.getState()
|
||||
.getValue(CardUtil.getCardZoneString("activationsCount" + originalId, sourceId, game));
|
||||
.getValue(CardUtil.getCardZoneString("activationsCount" + getOriginalId(), sourceId, game));
|
||||
Integer totalActivations = (Integer) game.getState()
|
||||
.getValue(CardUtil.getCardZoneString("totalActivations" + originalId, sourceId, game));
|
||||
.getValue(CardUtil.getCardZoneString("totalActivations" + getOriginalId(), sourceId, game));
|
||||
if (turnNum == null || activationCount == null || totalActivations == null) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -251,11 +251,11 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa
|
|||
|
||||
protected void setActivationInfo(ActivationInfo activationInfo, Game game) {
|
||||
game.getState().setValue(CardUtil
|
||||
.getCardZoneString("activationsTurn" + originalId, sourceId, game), activationInfo.turnNum);
|
||||
.getCardZoneString("activationsTurn" + getOriginalId(), sourceId, game), activationInfo.turnNum);
|
||||
game.getState().setValue(CardUtil
|
||||
.getCardZoneString("activationsCount" + originalId, sourceId, game), activationInfo.activationCounter);
|
||||
.getCardZoneString("activationsCount" + getOriginalId(), sourceId, game), activationInfo.activationCounter);
|
||||
game.getState().setValue(CardUtil
|
||||
.getCardZoneString("totalActivations" + originalId, sourceId, game), activationInfo.totalActivations);
|
||||
.getCardZoneString("totalActivations" + getOriginalId(), sourceId, game), activationInfo.totalActivations);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue