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

* Draft - Show draft time and draft progress. Show game threads and ma games. Fixed a problem with AI player and password.

Browse source
This commit is contained in:
LevelX2 2014-10-12 22:37:39 +02:00
parent 499b548a14
commit bdd163080d
12 changed files with 78 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,7 +249,7 @@ public class TableController {
return false;
}
// check password
if (!table.getMatch().getOptions().getPassword().isEmpty()) {
if (!table.getMatch().getOptions().getPassword().isEmpty() && playerType.equals("Human")) {
if (!table.getMatch().getOptions().getPassword().equals(password)) {
user.showUserMessage("Join Table", "Wrong password.");
return false;

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

@ -129,7 +129,11 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
Collections.sort(users, new UserNameSorter());
List<RoomUsersView> roomUserInfo = new ArrayList<>();
roomUserInfo.add(new RoomUsersView(users, GameManager.getInstance().getNumberActiveGames()));
roomUserInfo.add(new RoomUsersView(users,
GameManager.getInstance().getNumberActiveGames(),
ThreadExecutor.getInstance().getActiveThreads(ThreadExecutor.getInstance().getGameExecutor()),
ConfigSettings.getInstance().getMaxGameThreads()
));
roomUsersView = roomUserInfo;
}