github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Game: improved forced join on connection problem (player must leave game, more info in join message);

Browse source
This commit is contained in:
Oleg Agafonov 2020-02-21 12:41:20 +04:00
parent 58d7a96031
commit 459524b565
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,7 +226,7 @@ public class GameController implements GameCallback {
); );
joinWaitingExecutor.scheduleAtFixedRate(() -> { joinWaitingExecutor.scheduleAtFixedRate(() -> {
try { try {
sendInfoAboutPlayersNotJoinedYet(); sendInfoAboutPlayersNotJoinedYetAndTryToFixIt();
} catch (Exception ex) { } catch (Exception ex) {
logger.fatal("Send info about player not joined yet:", ex); logger.fatal("Send info about player not joined yet:", ex);
} }
@ -323,27 +323,44 @@ public class GameController implements GameCallback {
} }
} }
private void sendInfoAboutPlayersNotJoinedYet() { private void sendInfoAboutPlayersNotJoinedYetAndTryToFixIt() {
// runs every 5 secs untill all players join // runs every 5 secs untill all players join
for (Player player : game.getPlayers().values()) { for (Player player : game.getPlayers().values()) {
if (!player.hasLeft() && player.isHuman()) { if (player.isInGame() && player.isHuman()) {
Optional<User> requestedUser = getUserByPlayerId(player.getId()); Optional<User> requestedUser = getUserByPlayerId(player.getId());
if (requestedUser.isPresent()) { if (requestedUser.isPresent()) {
User user = requestedUser.get(); User user = requestedUser.get();
// TODO: workaround to fix not started games in tourneys, need to find out real reason // TODO: workaround to fix not started games in tourneys, need to find out real reason
if (gameSessions.get(player.getId()) == null) { if (gameSessions.get(player.getId()) == null) {
// join the game because player has not joined or was removed because of disconnect // join the game because player has not joined or was removed because of disconnect
String problemPlayerFixes;
user.removeConstructing(player.getId()); user.removeConstructing(player.getId());
GameManager.instance.joinGame(game.getId(), user.getId()); GameManager.instance.joinGame(game.getId(), user.getId());
logger.warn("Forced join of player " + player.getName() + " (" + user.getUserState() + ") to gameId: " + game.getId()); logger.warn("Forced join of player " + player.getName() + " (" + user.getUserState() + ") to gameId: " + game.getId());
if (user.isConnected()) { if (user.isConnected()) {
logger.warn("Send forced game start event for player " + player.getName() + " in gameId: " + game.getId()); // init game session, see reconnect()
user.ccGameStarted(game.getId(), player.getId()); GameSessionPlayer session = gameSessions.get(player.getId());
if (session != null) {
problemPlayerFixes = "re-send start game event";
logger.warn("Send forced game start event for player " + player.getName() + " in gameId: " + game.getId());
user.ccGameStarted(session.getGameId(), player.getId());
session.init();
GameManager.instance.sendPlayerString(session.getGameId(), user.getId(), "");
} else {
problemPlayerFixes = "leave on broken game session";
logger.error("Can't find game session for forced join, leave it: player " + player.getName() + " in gameId: " + game.getId());
player.leave();
}
} else {
problemPlayerFixes = "leave on disconnected";
logger.warn("User disconnected, leave him after forced join: player " + player.getName() + " in gameId: " + game.getId());
player.leave();
} }
ChatManager.instance.broadcast(chatId, player.getName(), user.getPingInfo() ChatManager.instance.broadcast(chatId, player.getName(), user.getPingInfo()
+ " is forced to join the game (waiting ends after " + " is forced to join the game (waiting ends after "
+ GAME_TIMEOUTS_CANCEL_PLAYER_GAME_JOINING_AFTER_INACTIVE_SECS + " secs)", + GAME_TIMEOUTS_CANCEL_PLAYER_GAME_JOINING_AFTER_INACTIVE_SECS
+ " secs, applied fixes: " + problemPlayerFixes + ")",
MessageColor.BLUE, true, ChatMessage.MessageType.STATUS, null); MessageColor.BLUE, true, ChatMessage.MessageType.STATUS, null);
} }
@ -1359,7 +1376,6 @@ public class GameController implements GameCallback {
} }
// TODO: fix non started game (send game started event to user?) // TODO: fix non started game (send game started event to user?)
// ALL DONE // ALL DONE
if (fixActions.isEmpty()) { if (fixActions.isEmpty()) {