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

GUI: hand zone - fixed wrong dragging effect while click on card, improved dragging animation, fixed wrong click if user return card to the original place

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-30 09:21:43 +04:00
parent cd07bbfdf2
commit e534497834
6 changed files with 39 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -317,6 +317,7 @@ public class GameController implements GameCallback {
}
user.get().addGame(playerId, gameSession);
logger.debug("Player " + player.getName() + ' ' + playerId + " has " + joinType + " gameId: " + game.getId());
// TODO: force user update?!
managerFactory.chatManager().broadcast(chatId, "", game.getPlayer(playerId).getLogName() + " has " + joinType + " the game", MessageColor.ORANGE, true, game, MessageType.GAME, null);
checkStart();
}

4
Mage.Server/src/main/java/mage/server/util/ThreadExecutorImpl.java
View file

@ -65,7 +65,7 @@ public class ThreadExecutorImpl implements ThreadExecutor {
// catch errors in CALL threads (from client commands)
t = ThreadUtils.findRealException(r, t);
if (t != null) {
if (t != null && !(t instanceof CancellationException)) {
logger.error("Catch unhandled error in CALL thread: " + t.getMessage(), t);
}
}
@ -84,7 +84,7 @@ public class ThreadExecutorImpl implements ThreadExecutor {
// catch errors in GAME threads (from game processing)
t = ThreadUtils.findRealException(r, t);
if (t != null) {
if (t != null && !(t instanceof CancellationException)) {
// it's impossible to brake game thread in normal use case, so each bad use case must be researched
logger.error("Catch unhandled error in GAME thread: " + t.getMessage(), t);
}