External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 05:09:16 -08:00
Code Issues Projects Releases Packages Wiki 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

8
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -603,7 +603,7 @@ public class HumanPlayer extends PlayerImpl {
passedUntilStackResolved = false;
}
}
while (isInGame()) {
while (canRespond()) {
updateGameStatePriority("priority", game);
game.firePriorityEvent(playerId);
waitForResponse(game);
@ -697,7 +697,7 @@ public class HumanPlayer extends PlayerImpl {
}
game.firePlayManaEvent(playerId, "Pay " + promptText, options);
waitForResponse(game);
if (!this.isInGame()) {
if (!this.canRespond()) {
return false;
}
if (response.getBoolean() != null) {
@ -1028,7 +1028,7 @@ public class HumanPlayer extends PlayerImpl {
public void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game) {
updateGameStatePriority("assignDamage", game);
int remainingDamage = damage;
while (remainingDamage > 0 && isInGame()) {
while (remainingDamage > 0 && canRespond()) {
Target target = new TargetCreatureOrPlayer();
if (singleTargetName != null) {
target.setTargetName(singleTargetName);
@ -1208,7 +1208,7 @@ public class HumanPlayer extends PlayerImpl {
if (!source.getAbilityType().equals(AbilityType.TRIGGERED)) {
done = true;
}
if (!isInGame()) {
if (!canRespond()) {
return null;
}
}