External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki 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

21
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -66,6 +66,7 @@ import java.util.Locale;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import mage.constants.ManaType;
import mage.constants.TableState;
/**
*
@ -346,7 +347,10 @@ public class MageServerImpl implements MageServer {
// }
@Override
public void startMatch(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
public boolean startMatch(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
if (!TableManager.getInstance().getController(tableId).changeTableState(TableState.STARTING)) {
return false;
}
execute("startMatch", sessionId, new Action() {
@Override
public void execute() {
@ -354,6 +358,7 @@ public class MageServerImpl implements MageServer {
TableManager.getInstance().startMatch(userId, roomId, tableId);
}
});
return true;
}
// @Override
@ -368,7 +373,10 @@ public class MageServerImpl implements MageServer {
// }
@Override
public void startTournament(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
public boolean startTournament(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
if (!TableManager.getInstance().getController(tableId).changeTableState(TableState.STARTING)) {
return false;
}
execute("startTournament", sessionId, new Action() {
@Override
public void execute() {
@ -376,6 +384,7 @@ public class MageServerImpl implements MageServer {
TableManager.getInstance().startTournament(userId, roomId, tableId);
}
});
return true;
}
@Override
@ -477,7 +486,12 @@ public class MageServerImpl implements MageServer {
}
@Override
public void leaveTable(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
public boolean leaveTable(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
TableState tableState = TableManager.getInstance().getController(tableId).getTableState();
if (!tableState.equals(TableState.WAITING) && !tableState.equals(TableState.READY_TO_START)) {
// table was already started, so player can't leave anymore now
return false;
}
execute("leaveTable", sessionId, new Action() {
@Override
public void execute() {
@ -485,6 +499,7 @@ public class MageServerImpl implements MageServer {
GamesRoomManager.getInstance().getRoom(roomId).leaveTable(userId, tableId);
}
});
return true;
}
@Override

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

@ -28,12 +28,20 @@
package mage.server;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import mage.MageException;
import mage.cards.decks.Deck;
import mage.cards.decks.DeckCardLists;
import mage.cards.decks.InvalidDeckException;
import mage.constants.RangeOfInfluence;
import mage.constants.TableState;
import mage.game.Game;
import mage.game.GameException;
import mage.game.Seat;
import mage.game.Table;
@ -41,6 +49,7 @@ import mage.game.draft.Draft;
import mage.game.draft.DraftPlayer;
import mage.game.events.Listener;
import mage.game.events.TableEvent;
import static mage.game.events.TableEvent.EventType.SIDEBOARD;
import mage.game.match.Match;
import mage.game.match.MatchOptions;
import mage.game.match.MatchPlayer;
@ -60,18 +69,8 @@ import mage.server.tournament.TournamentManager;
import mage.server.util.ConfigSettings;
import mage.server.util.ServerMessagesUtil;
import mage.server.util.ThreadExecutor;
import org.apache.log4j.Logger;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import mage.game.Game;
import mage.view.ChatMessage;
import org.apache.log4j.Logger;
/**
*
@ -377,45 +376,52 @@ public class TableController {
logger.error("No tournament object - userId: " + userId + " table: " + table.getId());
return;
}
UUID playerId = userPlayerMap.get(userId);
if (playerId != null) {
if (table.getState() == TableState.WAITING || table.getState() == TableState.STARTING) {
table.leaveNotStartedTable(playerId);
if (table.isTournament()) {
tournament.removePlayer(playerId);
} else {
match.leave(playerId);
}
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);
} else {
logger.debug("User not found - userId: " + userId + " tableId:" + table.getId());
}
userPlayerMap.remove(userId);
} else if (!table.getState().equals(TableState.FINISHED)) {
if (table.isTournament()) {
logger.debug("Quit tournament sub tables for userId: " + userId);
TableManager.getInstance().userQuitTournamentSubTables(userId);
logger.debug("Quit tournament Id: " + table.getTournament().getId());
TournamentManager.getInstance().quit(tournament.getId(), userId);
} else {
MatchPlayer matchPlayer = match.getPlayer(playerId);
if (matchPlayer != null) {
if (table.getState().equals(TableState.SIDEBOARDING)) {
// submit deck to finish sideboarding and trigger match start / end
matchPlayer.submitDeck(matchPlayer.getDeck());
}
matchPlayer.setQuit(true);
}
match.leave(playerId);
}
}
if (table != null
&& this.userId.equals(userId)
&& (table.getState().equals(TableState.WAITING)
|| table.getState().equals(TableState.READY_TO_START))) {
// table not started yet and user is the owner, remove the table
TableManager.getInstance().removeTable(table.getId());
} else {
logger.error("No playerId found for userId: " + userId);
UUID playerId = userPlayerMap.get(userId);
if (playerId != null) {
if (table.getState() == TableState.WAITING || table.getState() == TableState.READY_TO_START) {
table.leaveNotStartedTable(playerId);
if (table.isTournament()) {
tournament.removePlayer(playerId);
} else {
match.leave(playerId);
}
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);
} else {
logger.debug("User not found - userId: " + userId + " tableId:" + table.getId());
}
userPlayerMap.remove(userId);
} else if (!table.getState().equals(TableState.FINISHED)) {
if (table.isTournament()) {
logger.debug("Quit tournament sub tables for userId: " + userId);
TableManager.getInstance().userQuitTournamentSubTables(userId);
logger.debug("Quit tournament Id: " + table.getTournament().getId());
TournamentManager.getInstance().quit(tournament.getId(), userId);
} else {
MatchPlayer matchPlayer = match.getPlayer(playerId);
if (matchPlayer != null) {
if (table.getState().equals(TableState.SIDEBOARDING)) {
// submit deck to finish sideboarding and trigger match start / end
matchPlayer.submitDeck(matchPlayer.getDeck());
}
matchPlayer.setQuit(true);
}
match.leave(playerId);
}
}
} else {
logger.error("No playerId found for userId: " + userId);
}
}
}
@ -463,7 +469,7 @@ public class TableController {
}
public synchronized void startMatch() {
if (table.getState() == TableState.STARTING) {
if (table.getState().equals(TableState.STARTING)) {
try {
if (table.isTournamentSubTable()) {
logger.info("Tourn. match started id:" + match.getId() + " tournId: " + table.getTournament().getId());
@ -556,8 +562,8 @@ public class TableController {
}
public synchronized void startTournament(UUID userId) {
try {
if (userId.equals(this.userId) && table.getState() == TableState.STARTING) {
try {
if (userId.equals(this.userId) && table.getState().equals(TableState.STARTING)) {
TournamentManager.getInstance().createTournamentSession(tournament, userPlayerMap, table.getId());
for (Entry<UUID, UUID> entry: userPlayerMap.entrySet()) {
User user = UserManager.getInstance().getUser(entry.getKey());
@ -745,7 +751,7 @@ public class TableController {
}
public void swapSeats(int seatNum1, int seatNum2) {
if (table.getState() == TableState.STARTING) {
if (table.getState().equals(TableState.READY_TO_START)) {
if (seatNum1 >= 0 && seatNum2 >= 0 && seatNum1 < table.getSeats().length && seatNum2 < table.getSeats().length) {
Player swapPlayer = table.getSeats()[seatNum1].getPlayer();
String swapType = table.getSeats()[seatNum1].getPlayerType();
@ -790,7 +796,7 @@ public class TableController {
humanPlayers++;
if (!matchPlayer.hasQuit()) {
User user = UserManager.getInstance().getUser(userPlayerEntry.getKey());
if (user != null) {
if (user != null && user.isExpired(null)) {
validHumanPlayers++;
}
}
@ -805,4 +811,27 @@ public class TableController {
void cleanUp() {
ChatManager.getInstance().destroyChatSession(chatId);
}
public synchronized TableState getTableState() {
return getTable().getState();
}
public synchronized boolean changeTableState(TableState newTableState) {
switch (newTableState) {
case WAITING:
if (getTable().getState().equals(TableState.STARTING)){
// tournament already started
return false;
}
break;
case STARTING:
if (!getTable().getState().equals(TableState.READY_TO_START)){
// tournament is not ready, can't start
return false;
}
break;
}
getTable().setState(newTableState);
return true;
}
}

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)) {

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

@ -219,15 +219,15 @@ class TableListSorter implements Comparator<Table> {
@Override
public int compare(Table one, Table two) {
// priority 1 - Not started yet
if (one.getState().equals(TableState.STARTING) || one.getState().equals(TableState.WAITING)) {
if (two.getState().equals(TableState.STARTING) || two.getState().equals(TableState.WAITING)) {
if (one.getState().equals(TableState.READY_TO_START) || one.getState().equals(TableState.WAITING)) {
if (two.getState().equals(TableState.READY_TO_START) || two.getState().equals(TableState.WAITING)) {
return two.getCreateTime().compareTo(one.getCreateTime());
} else {
return -1; // one has higher priority
}
}
// priority 2 - Not finished yet -> Sorted by time started
if (two.getState().equals(TableState.STARTING) || two.getState().equals(TableState.WAITING)) {
if (two.getState().equals(TableState.READY_TO_START) || two.getState().equals(TableState.WAITING)) {
return 1; // two has higher priority
} else if (one.getEndTime() == null) {
if (two.getEndTime() == null) {