External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

npe fix appearing on server

Browse source
This commit is contained in:
Loki 2012-05-05 08:29:15 +04:00
parent a746ca680b
commit ee73ac75eb
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,7 +157,7 @@ public class Session {
call.setMessageId(messageId++);
callbackHandler.handleCallbackOneway(new Callback(call));
} catch (HandleCallbackException ex) {
logger.fatal("Session fireCallback error", ex);
logger.fatal("Session fireCallback error: " + ex.getMessage(), ex);
disconnect();
}
}

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

@ -100,12 +100,14 @@ public class UserManager {
}
public void disconnect(UUID userId) {
ChatManager.getInstance().removeUser(userId);
if (users.containsKey(userId)) {
logger.info("user disconnected " + userId);
users.get(userId).setSessionId("");
ChatManager.getInstance().broadcast(userId, "has lost connection", MessageColor.BLACK);
}
if (userId != null) {
ChatManager.getInstance().removeUser(userId);
if (users.containsKey(userId)) {
logger.info("user disconnected " + userId);
users.get(userId).setSessionId("");
ChatManager.getInstance().broadcast(userId, "has lost connection", MessageColor.BLACK);
}
}
}
public boolean isAdmin(UUID userId) {