Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Changes to game log.

Browse source
This commit is contained in:
LevelX2 2014-07-09 20:44:06 +02:00
parent 3c3ebce7d5
commit d40a3f591d
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/src/main/java/mage/server/UserManager.java
View file

@ -182,7 +182,7 @@ public class UserManager {
}
public void handleException(Exception ex) {
if (!ex.getMessage().equals("No message")) {
if (ex != null && !ex.getMessage().equals("No message")) {
logger.fatal("", ex);
}
}

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

@ -56,6 +56,7 @@ import mage.view.GameClientMessage;
import mage.view.GameView;
import mage.view.LookedAtView;
import mage.view.SimpleCardsView;
import org.apache.log4j.Logger;
/**
*
@ -63,6 +64,8 @@ import mage.view.SimpleCardsView;
*/
public class GameSession extends GameWatcher {
private static final Logger logger = Logger.getLogger(GameSession.class);
private final UUID playerId;
private final boolean useTimeout;
@ -277,7 +280,10 @@ public class GameSession extends GameWatcher {
public void kill() {
if (game != null) {
logger.debug("GameSession.kill before player quit for game");
game.quit(playerId);
} else {
logger.error("GameSession.kill game object missing playerId: " + (playerId == null ? "[null]":playerId));
}
}

8
Mage/src/mage/game/GameImpl.java
View file

@ -943,17 +943,19 @@ public abstract class GameImpl implements Game, Serializable {
@Override
public synchronized void quit(UUID playerId) {
logger.debug("GameImpl.quit start " + playerId);
if (state != null) {
Player player = state.getPlayer(playerId);
if (player != null) {
logger.debug("gameImpl.quit" + player.getName() + " quits the game");
logger.debug("GameImpl.quit " + player.getName() + " quits the game");
player.quit(this);
}else {
logger.error(new StringBuilder("gameImpl.quit - player not found - playerId: ").append(playerId));
logger.error(new StringBuilder("GameImpl.quit - player not found - playerId: ").append(playerId));
}
} else {
logger.error(new StringBuilder("gameImpl.quit - state not found - playerId: ").append(playerId));
logger.error(new StringBuilder("GameImpl.quit - state not found - playerId: ").append(playerId));
}
logger.debug("GameImpl.quit end " + playerId);
}
@Override