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

20
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -487,13 +487,21 @@ public class GameController implements GameCallback {
if (data instanceof Integer) {
turnsToRollback = (Integer) data;
if (game.canRollbackTurns(turnsToRollback)) {
requestsOpen = requestPermissionToRollback(userId, turnsToRollback);
if (requestsOpen == 0) {
game.rollbackTurns(turnsToRollback);
turnsToRollback = -1;
requestsOpen = -1;
UUID playerId = getPlayerId(userId);
if (game.getPriorityPlayerId().equals(playerId)) {
requestsOpen = requestPermissionToRollback(userId, turnsToRollback);
if (requestsOpen == 0) {
game.rollbackTurns(turnsToRollback);
turnsToRollback = -1;
requestsOpen = -1;
} else {
userReqestingRollback = userId;
}
} else {
userReqestingRollback = userId;
Player player = game.getPlayer(playerId);
if (player != null) {
game.informPlayer(player, "You can only request a rollback if you have priority.");
}
}
} else {
UUID playerId = getPlayerId(userId);