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

use isActivePlayer where possible, some minor text fixes

Browse source
This commit is contained in:
igoudt 2018-06-29 21:18:05 +02:00
parent 013eccb6fa
commit dcb1affb9d
27 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/effects/common/DetainAllEffect.java
View file

@ -77,7 +77,7 @@ class DetainAllRestrictionEffect extends RestrictionEffect {
for (FixedTarget fixedTarget : this.detainedObjects) {
Permanent permanent = game.getPermanent(fixedTarget.getFirst(game, source));
if (permanent != null) {
permanent.addInfo(new StringBuilder("detain").append(getId()).toString(), "[Detained]", game);
permanent.addInfo("detain" + getId(), "[Detained]", game);
}
}
}
@ -85,11 +85,11 @@ class DetainAllRestrictionEffect extends RestrictionEffect {
@Override
public boolean isInactive(Ability source, Game game) {
if (game.getPhase().getStep().getType() == PhaseStep.UNTAP && game.getStep().getStepPart() == Step.StepPart.PRE) {
if (game.getActivePlayerId().equals(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
if (game.isActivePlayer(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
for (FixedTarget fixedTarget : this.detainedObjects) {
Permanent permanent = game.getPermanent(fixedTarget.getFirst(game, source));
if (permanent != null) {
permanent.addInfo(new StringBuilder("detain").append(getId()).toString(), "", game);
permanent.addInfo("detain" + getId(), "", game);
}
}
return true;