github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed a bug that for players was not shown, that they play a tournament after round 1.

Browse source
This commit is contained in:
LevelX2 2015-01-07 23:43:58 +01:00
parent effa560e02
commit 148994c9e5
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,7 +300,9 @@ public class TableController {
logger.trace(player.getName() + " joined tableId: " + table.getId());
//only inform human players and add them to sessionPlayerMap
if (seat.getPlayer().isHuman()) {
user.addTable(player.getId(), table);
if (!table.isTournamentSubTable()) {
user.addTable(player.getId(), table);
}
user.ccJoinedTable(table.getRoomId(), table.getId(), false);
userPlayerMap.put(userId, player.getId());
}
@ -466,7 +468,9 @@ public class TableController {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
ChatManager.getInstance().broadcast(chatId, user.getName(), "has left the table", ChatMessage.MessageColor.BLUE, true, ChatMessage.MessageType.STATUS, ChatMessage.SoundToPlay.PlayerLeft);
user.removeTable(playerId);
if (!table.isTournamentSubTable()) {
user.removeTable(playerId);
}
} else {
logger.debug("User not found - userId: " + userId + " tableId:" + table.getId());
}
@ -777,7 +781,9 @@ public class TableController {
user.showUserMessage("Match info", sb.toString());
}
// remove table from user - table manager holds table for display of finished matches
user.removeTable(entry.getValue());
if (!table.isTournamentSubTable()) {
user.removeTable(entry.getValue());
}
}
}
}
@ -923,11 +929,13 @@ public class TableController {
}
void cleanUp() {
for(Map.Entry<UUID, UUID> entry: userPlayerMap.entrySet()) {
User user = UserManager.getInstance().getUser(entry.getKey());
if (user != null) {
user.removeTable(entry.getValue());
}
if (!table.isTournamentSubTable()) {
for(Map.Entry<UUID, UUID> entry: userPlayerMap.entrySet()) {
User user = UserManager.getInstance().getUser(entry.getKey());
if (user != null) {
user.removeTable(entry.getValue());
}
}
}
ChatManager.getInstance().destroyChatSession(chatId);
}