From 5212c3c7ddc77469b28b617101dce0831f6433f7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 4 Feb 2017 14:27:03 +0100 Subject: [PATCH] Fixed an Optional<> bug of GameController. --- .../main/java/mage/server/game/GameController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index 854f40680ed..4e900e6d28a 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -44,7 +44,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.zip.GZIPOutputStream; - import mage.MageException; import mage.abilities.Ability; import mage.cards.Card; @@ -313,10 +312,10 @@ public class GameController implements GameCallback { logger.fatal("- userId: " + userId); return; } - if (!user.isPresent()) { - logger.fatal("User not found : "+userId); - return; - } + if (!user.isPresent()) { + logger.fatal("User not found : " + userId); + return; + } Player player = game.getPlayer(playerId); if (player == null) { logger.fatal("Player not found - playerId: " + playerId); @@ -350,8 +349,9 @@ public class GameController implements GameCallback { private void sendInfoAboutPlayersNotJoinedYet() { for (Player player : game.getPlayers().values()) { if (!player.hasLeft() && player.isHuman()) { - User user = getUserByPlayerId(player.getId()).get(); - if (user != null) { + Optional requestedUser = getUserByPlayerId(player.getId()); + if (requestedUser.isPresent()) { + User user = requestedUser.get(); if (!user.isConnected()) { if (gameSessions.get(player.getId()) == null) { // join the game because player has not joined are was removed because of disconnect