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 Issue 100

Browse source
This commit is contained in:
BetaSteward 2011-05-13 23:11:06 -04:00
parent 0a5e8e0103
commit 55f3842464
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,11 @@ public class TableController {
chatId = ChatManager.getInstance().createChatSession();
this.options = options;
match = GameFactory.getInstance().createMatch(options.getGameType(), options);
controllerName = SessionManager.getInstance().getSession(sessionId).getUsername();
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null)
controllerName = session.getUsername();
else
controllerName = "System";
table = new Table(roomId, options.getGameType(), options.getName(), controllerName, DeckValidatorFactory.getInstance().createDeckValidator(options.getDeckType()), options.getPlayerTypes(), match);
init();
}
@ -87,7 +91,11 @@ public class TableController {
this.sessionId = sessionId;
chatId = ChatManager.getInstance().createChatSession();
tournament = TournamentFactory.getInstance().createTournament(options.getTournamentType(), options);
controllerName = SessionManager.getInstance().getSession(sessionId).getUsername();
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null)
controllerName = session.getUsername();
else
controllerName = "System";
table = new Table(roomId, options.getTournamentType(), options.getName(), controllerName, DeckValidatorFactory.getInstance().createDeckValidator(options.getMatchOptions().getDeckType()), options.getPlayerTypes(), tournament);
}
@ -291,7 +299,8 @@ public class TableController {
TournamentManager.getInstance().createTournamentSession(tournament, sessionPlayerMap, table.getId());
SessionManager sessionManager = SessionManager.getInstance();
for (Entry<UUID, UUID> entry: sessionPlayerMap.entrySet()) {
sessionManager.getSession(entry.getKey()).tournamentStarted(tournament.getId(), entry.getValue());
Session session = sessionManager.getSession(entry.getKey());
session.tournamentStarted(tournament.getId(), entry.getValue());
}
}
}