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

Some changes to game end handling (in hope to fix/improve server handling of games). Some chanmges to log messages.

Browse source
This commit is contained in:
LevelX2 2014-08-17 02:49:21 +02:00
parent c449a9b2fd
commit 0c03ce3727
4 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Server/src/main/java/mage/server/SessionManager.java
View file

@ -174,15 +174,17 @@ public class SessionManager {
}
public User getUser(String sessionId) {
if (sessions.containsKey(sessionId)) {
Session session = sessions.get(sessionId);
if (session != null) {
return UserManager.getInstance().getUser(sessions.get(sessionId).getUserId());
}
return null;
}
public boolean extendUserSession(String sessionId) {
if (sessions.containsKey(sessionId)) {
return UserManager.getInstance().extendUserSession(sessions.get(sessionId).getUserId());
public boolean extendUserSession(String sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
return UserManager.getInstance().extendUserSession(session.getUserId());
}
return false;
}

6
Mage.Server/src/main/java/mage/server/game/GameSession.java
View file

@ -276,8 +276,10 @@ public class GameSession extends GameWatcher {
public void kill() {
if (game != null) {
logger.debug("before game.quit playerId:" + playerId);
game.quit(playerId);
if (game.getPlayer(playerId).isInGame()) {
logger.debug("QUIT game playerId: " + playerId + " gameId: " + game.getId());
game.quit(playerId);
}
} else {
logger.error("game object missing playerId: " + (playerId == null ? "[null]":playerId));
}