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

* Some minor reworks to prevent exceptions.

Browse source
This commit is contained in:
LevelX2 2017-07-23 23:16:27 +02:00
parent 2efc666f8d
commit fbd90bb3e0
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,10 @@
*/ */
package mage.server; package mage.server;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import mage.cards.decks.Deck; import mage.cards.decks.Deck;
import mage.constants.ManaType; import mage.constants.ManaType;
import mage.constants.TableState; import mage.constants.TableState;
@ -51,11 +55,6 @@ import mage.server.util.SystemUtil;
import mage.view.TableClientMessage; import mage.view.TableClientMessage;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
/** /**
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
@ -242,8 +241,8 @@ public class User {
public void fireCallback(final ClientCallback call) { public void fireCallback(final ClientCallback call) {
if (isConnected()) { if (isConnected()) {
SessionManager.instance.getSession(sessionId).ifPresent(session -> SessionManager.instance.getSession(sessionId).ifPresent(session
session.fireCallback(call) -> session.fireCallback(call)
); );
} }
} }
@ -378,11 +377,10 @@ public class User {
} }
for (Entry<UUID, Deck> entry : sideboarding.entrySet()) { for (Entry<UUID, Deck> entry : sideboarding.entrySet()) {
Optional<TableController> controller = TableManager.instance.getController(entry.getKey()); Optional<TableController> controller = TableManager.instance.getController(entry.getKey());
if(controller.isPresent()) { if (controller.isPresent()) {
ccSideboard(entry.getValue(), entry.getKey(), controller.get().getRemainingTime(), controller.get().getOptions().isLimited()); ccSideboard(entry.getValue(), entry.getKey(), controller.get().getRemainingTime(), controller.get().getOptions().isLimited());
} } else {
else{ logger.error("sideboarding id not found : " + entry.getKey());
logger.error("sideboarding id not found : "+entry.getKey());
} }
} }
ServerMessagesUtil.instance.incReconnects(); ServerMessagesUtil.instance.incReconnects();
@ -458,7 +456,8 @@ public class User {
} }
gameSessions.clear(); gameSessions.clear();
logger.trace("REMOVE " + userName + " watched Games " + watchedGames.size()); logger.trace("REMOVE " + userName + " watched Games " + watchedGames.size());
for (UUID gameId : watchedGames) { for (Iterator<UUID> it = watchedGames.iterator(); it.hasNext();) { // Iterator to prevent ConcurrentModificationException
UUID gameId = it.next();
GameManager.instance.stopWatching(gameId, userId); GameManager.instance.stopWatching(gameId, userId);
} }
watchedGames.clear(); watchedGames.clear();
@ -789,10 +788,9 @@ public class User {
number++; number++;
} else { } else {
Optional<TableController> tableController = TableManager.instance.getController(table.getId()); Optional<TableController> tableController = TableManager.instance.getController(table.getId());
if(!tableController.isPresent()){ if (!tableController.isPresent()) {
logger.error("table not found : "+table.getId()); logger.error("table not found : " + table.getId());
} } else if (tableController.get().isUserStillActive(userId)) {
else if (tableController.get().isUserStillActive(userId)) {
number++; number++;
} }
} }