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

Fixed a bug that while a match or tournament was just starting a player could still leave the table, setting the table / tournament / match to an undefined state. Now the player can only leave the Match / Tournament if it has started properly.

Browse source
This commit is contained in:
LevelX2 2014-09-03 01:02:10 +02:00
parent 3f5f6a6166
commit fec0744315
10 changed files with 159 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Server/src/main/java/mage/server/TableManager.java
View file

@ -223,18 +223,7 @@ public class TableManager {
public void leaveTable(UUID userId, UUID tableId) {
TableController tableController = controllers.get(tableId);
if (tableController != null) {
// table not started yet and user is the owner, remove the table
Table table = getTable(tableId);
if (table != null
&& isTableOwner(tableId, userId)
&& (table.getState().equals(TableState.WAITING)
|| table.getState().equals(TableState.STARTING))) {
removeTable(tableId);
} else {
logger.debug("TABLE leave - userId: " + userId + " tableId: " + tableId);
tableController.leaveTable(userId);
}
tableController.leaveTable(userId);
}
}
@ -275,9 +264,9 @@ public class TableManager {
public void startTournament(UUID userId, UUID roomId, UUID tableId) {
if (controllers.containsKey(tableId)) {
controllers.get(tableId).startTournament(userId);
ChatManager.getInstance().destroyChatSession(controllers.get(tableId).getChatId());
ChatManager.getInstance().destroyChatSession(controllers.get(tableId).getChatId());
}
}
}
public void startDraft(UUID tableId, Draft draft) {
if (controllers.containsKey(tableId)) {