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

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

@ -81,7 +81,7 @@ public class DontUntapInPlayersNextUntapStepAllEffect extends ContinuousRuleModi
}
// remember the turn of the untap step the effect has to be applied
if (event.getType() == EventType.UNTAP_STEP) {
if (game.getActivePlayerId().equals(getTargetPointer().getFirst(game, source))) {
if (game.isActivePlayer(getTargetPointer().getFirst(game, source))) {
if (validForTurnNum == game.getTurnNum()) { // the turn has a second untap step but the effect is already related to the first untap step
discard();
return false;
@ -100,7 +100,7 @@ public class DontUntapInPlayersNextUntapStepAllEffect extends ContinuousRuleModi
if (controller != null && !game.isOpponent(controller, permanent.getControllerId())) {
return false;
}
if (game.getActivePlayerId().equals(permanent.getControllerId())
if (game.isActivePlayer(permanent.getControllerId())
&& // controller's untap step
filter.match(permanent, source.getSourceId(), source.getControllerId(), game)) {
return true;