External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some changes to logging and NPE handling.

Browse source
This commit is contained in:
LevelX2 2014-08-17 20:38:57 +02:00
parent 3e789ccb1f
commit ddb9c786b4
7 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,10 +72,14 @@ public class ChatSession {
public void kill(UUID userId, DisconnectReason reason) {
try {
if (userId != null && clients.containsKey(userId)) {
if (reason == null) {
logger.fatal("User kill without disconnect reason userId: " + userId) ;
reason = DisconnectReason.Undefined;
}
if (reason != null && userId != null && clients.containsKey(userId)) {
String userName = clients.get(userId);
clients.remove(userId);
logger.debug(userName + (reason == null?"null":"(" + reason.toString() +")") + " removed from chatId " + chatId) ;
logger.debug(userName + "(" + reason.toString() +")" + " removed from chatId " + chatId) ;
String message;
switch (reason) {
case Disconnected:
@ -85,7 +89,7 @@ public class ChatSession {
message = " has lost connection";
break;
default:
message = reason == null ? " left (unknown reason) ": " left (" + reason.toString() +")";
message = " left (" + reason.toString() +")";
}
if (message != null) {
broadcast(null, new StringBuilder(userName).append(message).toString(), MessageColor.BLUE, true, MessageType.STATUS);

19
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -510,8 +510,11 @@ public class TableController {
}
}
else {
logger.error("Unable to find player " + entry.getKey());
match.getPlayer(entry.getValue()).setQuit(true);
logger.error("Unable to find user: " + entry.getKey() + " playerId: " + entry.getValue());
MatchPlayer matchPlayer = match.getPlayer(entry.getValue());
if (matchPlayer != null && !matchPlayer.hasQuit()) {
matchPlayer.setQuit(true);
}
}
}
}
@ -526,11 +529,16 @@ public class TableController {
}
ServerMessagesUtil.getInstance().incGamesStarted();
// log about game started
logger.info("GAME started [" + match.getName() +"] "+ creator + " - " + opponent.toString());
logger.debug("- matchId: " + match.getId() + " [" + match.getName() + "]");
logger.debug("- gameId: " + match.getGame().getId());
logger.debug("- chatId: " + GameManager.getInstance().getChatId(match.getGame().getId()));
if (match.getGame() != null) {
logger.debug("- gameId: " + match.getGame().getId());
logger.debug("- chatId: " + GameManager.getInstance().getChatId(match.getGame().getId()));
} else {
logger.debug("- no valid game object");
}
LogServiceImpl.instance.log(LogKeys.KEY_GAME_STARTED, String.valueOf(userPlayerMap.size()), creator, opponent.toString());
}
catch (Exception ex) {
@ -622,6 +630,9 @@ public class TableController {
*/
public boolean endGameAndStartNextGame() {
// get player that chooses who goes first
if (match.getGame() == null) {
return true;
}
UUID choosingPlayerId = match.getChooser();
match.endGame();
if (ConfigSettings.getInstance().isSaveGameActivated() && !match.getGame().isSimulation()) {

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

@ -81,7 +81,10 @@ public class UserManager {
}
public User getUser(UUID userId) {
return users.get(userId);
if (userId != null) {
return users.get(userId);
}
return null;
}
public User findUser(String userName) {