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

* Rollback - Fixed that UI is locked after a accepted rollback request (fixes #1158).

Browse source
This commit is contained in:
LevelX2 2015-08-02 12:39:02 +02:00
parent eccc367920
commit efb5e06e57
159 changed files with 231 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/game/stack/StackObjImpl.java
View file

@ -182,7 +182,7 @@ public abstract class StackObjImpl implements StackObject {
newTarget.clearChosen();
}
}
} while (targetController.isInGame() && (targetId.equals(newTarget.getFirstTarget()) || newTarget.getTargets().size() != 1));
} while (targetController.canRespond() && (targetId.equals(newTarget.getFirstTarget()) || newTarget.getTargets().size() != 1));
// choose a new target
} else {
// build a target definition with exactly one possible target to select that replaces old target
@ -235,7 +235,7 @@ public abstract class StackObjImpl implements StackObject {
newTarget.addTarget(tempTarget.getFirstTarget(), target.getTargetAmount(targetId), ability, game, false);
}
}
} while (again && targetController.isInGame());
} while (again && targetController.canRespond());
}
} // keep the target
else {