External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: fixed that rollback request can hide some active dialogs of other priority player (yes/no, play priority, targets, attackers, etc)

Browse source
This commit is contained in:
Oleg Agafonov 2024-06-07 12:42:08 +04:00
parent 6d392bcdcf
commit e9f0539a40
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -516,6 +516,8 @@ public class GameController implements GameCallback {
if (game.canRollbackTurns(turnsToRollback)) { if (game.canRollbackTurns(turnsToRollback)) {
UUID playerId = getPlayerId(userId); UUID playerId = getPlayerId(userId);
if (game.getPriorityPlayerId().equals(playerId)) { if (game.getPriorityPlayerId().equals(playerId)) {
// rollback request on own priority - can stop current choose dialog
// TODO: make it async on any priority like concede
requestsOpen = requestPermissionToRollback(userId, turnsToRollback); requestsOpen = requestPermissionToRollback(userId, turnsToRollback);
if (requestsOpen == 0) { if (requestsOpen == 0) {
game.rollbackTurns(turnsToRollback); game.rollbackTurns(turnsToRollback);
@ -926,7 +928,7 @@ public class GameController implements GameCallback {
} }
private void informPersonal(UUID playerId, final String message) throws MageException { private void informPersonal(UUID playerId, final String message) throws MageException {
perform(playerId, playerId1 -> getGameSession(playerId1).informPersonal(message)); perform(playerId, playerId1 -> getGameSession(playerId1).informPersonal(message), false);
} }
private void error(String message, Exception ex) { private void error(String message, Exception ex) {