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

Merge branch 'master' of https://github.com/magefree/mage

Browse source
This commit is contained in:
Goudt 2017-01-18 23:53:29 +01:00
commit a522930592
104 changed files with 1024 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@ public class MageServerImpl implements MageServer {
}
return true;
}
@Override
public boolean resetPassword(String sessionId, String email, String authToken, String password) throws MageException {
if (!ConfigSettings.getInstance().isAuthenticationActivated()) {
@ -942,7 +942,8 @@ public class MageServerImpl implements MageServer {
user.getGameInfo(),
user.getUserState().toString(),
user.getChatLockedUntil(),
user.getClientVersion()
user.getClientVersion(),
user.getEmail()
));
}
return users;