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

changed cardtype from list to enumset

Browse source
This commit is contained in:
ingmargoudt 2017-03-03 17:04:32 +01:00
parent c0ffc47bf7
commit 372584f7ad
22 changed files with 116 additions and 55 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

@ -170,7 +170,7 @@ public class UserManager {
calendar.add(Calendar.MINUTE, -3);
List<User> usersToCheck = new ArrayList<>(users.values());
for (User user : usersToCheck) {
if (!user.getUserState().equals(UserState.Expired) && user.isExpired(calendar.getTime())) {
if (user.getUserState() != UserState.Expired && user.isExpired(calendar.getTime())) {
removeUser(user.getId(), DisconnectReason.SessionExpired);
}
}

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

@ -401,7 +401,7 @@ public class GameController implements GameCallback {
return false;
}
}
if (player.isHuman() && gameSessions.get(player.getId()) == null) {
if (player.isHuman() && !gameSessions.containsKey(player.getId())) {
return false;
}
}
@ -410,11 +410,11 @@ public class GameController implements GameCallback {
}
public void watch(UUID userId) {
if (userPlayerMap.get(userId) != null) {
if (userPlayerMap.containsKey(userId)) {
// You can't watch a game if you already a player in it
return;
}
if (watchers.get(userId) != null) {
if (watchers.containsKey(userId)) {
// You can't watch a game if you already watch it
return;
}