External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

added draft and tournament methods + some refactoring

Browse source
This commit is contained in:
betasteward 2015-07-05 08:57:14 -04:00
parent 1ff7f4ba5c
commit 8225a4080c
58 changed files with 1038 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

332
Mage.Server/src/main/java/mage/server/ServerMain.java
View file

@ -45,13 +45,16 @@ import mage.choices.Choice;
import mage.constants.ManaType;
import mage.constants.PlayerAction;
import mage.constants.TableState;
import mage.game.Table;
import mage.game.match.MatchOptions;
import mage.game.match.MatchType;
import mage.game.tournament.TournamentOptions;
import mage.game.tournament.TournamentType;
import mage.interfaces.ServerState;
import mage.remote.Connection;
import mage.remote.DisconnectReason;
import mage.server.draft.CubeFactory;
import mage.server.draft.DraftManager;
import mage.server.game.DeckValidatorFactory;
import mage.server.game.GameFactory;
import mage.server.game.GameManager;
@ -62,6 +65,7 @@ import mage.server.services.LogKeys;
import mage.server.services.impl.FeedbackServiceImpl;
import mage.server.services.impl.LogServiceImpl;
import mage.server.tournament.TournamentFactory;
import mage.server.tournament.TournamentManager;
import mage.server.util.ConfigSettings;
import mage.server.util.PluginClassLoader;
import mage.server.util.ServerMessagesUtil;
@ -249,43 +253,33 @@ public class ServerMain implements MageServer {
LogServiceImpl.instance.log(LogKeys.KEY_TABLE_CREATED, sessionId, userId.toString(), table.getTableId().toString());
return table;
}
//
// @Override
// public TableView createTournamentTable(final String sessionId, final UUID roomId, final TournamentOptions options) throws MageException {
// return executeWithResult("createTournamentTable", sessionId, new ActionWithTableViewResult() {
// @Override
// public TableView execute() throws MageException {
// try {
// UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// // check AI players max
// String maxAiOpponents = ConfigSettings.getInstance().getMaxAiOpponents();
// if (maxAiOpponents != null) {
// int max = Integer.parseInt(maxAiOpponents);
// int aiPlayers = 0;
// for (String playerType : options.getPlayerTypes()) {
// if (!playerType.equals("Human")) {
// aiPlayers++;
// }
// }
// if (aiPlayers > max) {
// User user = UserManager.getInstance().getUser(userId);
// if (user != null) {
// user.showUserMessage("Create tournament", "It's only allowed to use a maximum of " + max + " AI players.");
// }
// throw new MageException("No message");
// }
// }
// TableView table = GamesRoomManager.getInstance().getRoom(roomId).createTournamentTable(userId, options);
// logger.debug("Tournament table " + table.getTableId() + " created");
// LogServiceImpl.instance.log(LogKeys.KEY_TOURNAMENT_TABLE_CREATED, sessionId, userId.toString(), table.getTableId().toString());
// return table;
// } catch (Exception ex) {
// handleException(ex);
// }
// return null;
// }
// });
// }
@Override
public TableView createTournamentTable(final String sessionId, final UUID roomId, final TournamentOptions options) {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// check AI players max
String maxAiOpponents = ConfigSettings.getInstance().getMaxAiOpponents();
if (maxAiOpponents != null) {
int max = Integer.parseInt(maxAiOpponents);
int aiPlayers = 0;
for (String playerType : options.getPlayerTypes()) {
if (!playerType.equals("Human")) {
aiPlayers++;
}
}
if (aiPlayers > max) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.showUserMessage("Create tournament", "It's only allowed to use a maximum of " + max + " AI players.");
}
return null;
}
}
TableView table = GamesRoomManager.getInstance().getRoom(roomId).createTournamentTable(userId, options);
logger.debug("Tournament table " + table.getTableId() + " created");
LogServiceImpl.instance.log(LogKeys.KEY_TOURNAMENT_TABLE_CREATED, sessionId, userId.toString(), table.getTableId().toString());
return table;
}
@Override
public void removeTable(final String sessionId, final UUID roomId, final UUID tableId) {
@ -437,34 +431,22 @@ public class ServerMain implements MageServer {
// }
// });
// }
//
// @Override
// 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() {
// UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// TableManager.getInstance().startTournament(userId, roomId, tableId);
// }
// });
// return true;
// }
//
// @Override
// //FIXME: why no sessionId here???
// public TournamentView getTournament(UUID tournamentId) throws MageException {
// try {
// return TournamentManager.getInstance().getTournamentView(tournamentId);
// }
// catch (Exception ex) {
// handleException(ex);
// }
// return null;
// }
//
@Override
public boolean startTournament(final String sessionId, final UUID roomId, final UUID tableId) {
if (!TableManager.getInstance().getController(tableId).changeTableState(TableState.STARTING)) {
return false;
}
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().startTournament(userId, roomId, tableId);
return true;
}
@Override
public TournamentView getTournament(UUID tournamentId) {
return TournamentManager.getInstance().getTournamentView(tournamentId);
}
// @Override
// //FIXME: why no sessionId here???
// public void sendChatMessage(final UUID chatId, final String userName, final String message) throws MageException {
@ -573,28 +555,20 @@ public class ServerMain implements MageServer {
return GameManager.getInstance().getChatId(gameId);
}
// @Override
// public void joinDraft(final UUID draftId, final String sessionId) throws MageException {
// execute("joinDraft", sessionId, new Action() {
// @Override
// public void execute() {
// UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// DraftManager.getInstance().joinDraft(draftId, userId);
// }
// });
// }
//
// @Override
// public void joinTournament(final UUID tournamentId, final String sessionId) throws MageException {
// execute("joinTournament", sessionId, new Action() {
// @Override
// public void execute() {
// UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// TournamentManager.getInstance().joinTournament(tournamentId, userId);
// }
// });
// }
//
@Override
public boolean joinDraft(final UUID draftId, final String sessionId) {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
DraftManager.getInstance().joinDraft(draftId, userId);
return true;
}
@Override
public boolean joinTournament(final UUID tournamentId, final String sessionId) {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TournamentManager.getInstance().joinTournament(tournamentId, userId);
return true;
}
// @Override
// //FIXME: why no sessionId here???
// public UUID getGameChatId(UUID gameId) throws MageException {
@ -606,19 +580,12 @@ public class ServerMain implements MageServer {
// }
// return null;
// }
//
// @Override
// //FIXME: why no sessionId here???
// public UUID getTournamentChatId(UUID tournamentId) throws MageException {
// try {
// return TournamentManager.getInstance().getChatId(tournamentId);
// }
// catch (Exception ex) {
// handleException(ex);
// }
// return null;
// }
//
@Override
public UUID getTournamentChatId(UUID tournamentId) {
return TournamentManager.getInstance().getChatId(tournamentId);
}
@Override
public void sendPlayerUUID(final UUID gameId, final String sessionId, final UUID data) {
User user = SessionManager.getInstance().getUser(sessionId);
@ -669,87 +636,62 @@ public class ServerMain implements MageServer {
logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
}
}
//
// @Override
// public DraftPickView sendCardPick(final UUID draftId, final String sessionId, final UUID cardPick, final Set<UUID> hiddenCards) throws MageException {
// return executeWithResult("sendCardPick", sessionId, new ActionWithNullNegativeResult<DraftPickView>() {
// @Override
// public DraftPickView execute() {
// Session session = SessionManager.getInstance().getSession(sessionId);
// if (session != null) {
// return DraftManager.getInstance().sendCardPick(draftId, session.getUserId(), cardPick, hiddenCards);
// } else{
// logger.error("Session not found sessionId: "+ sessionId + " draftId:" + draftId);
// }
// return null;
// }
// });
// }
//
// @Override
// public void sendCardMark(final UUID draftId, final String sessionId, final UUID cardPick) throws MageException {
// execute("sendCardMark", sessionId, new Action() {
// @Override
// public void execute() {
// Session session = SessionManager.getInstance().getSession(sessionId);
// if (session != null) {
// DraftManager.getInstance().sendCardMark(draftId, session.getUserId(), cardPick);
// } else{
// logger.error("Session not found sessionId: "+ sessionId + " draftId:" + draftId);
// }
// }
// });
// }
//
// @Override
// public void quitMatch(final UUID gameId, final String sessionId) throws MageException {
// execute("quitMatch", sessionId, new Action() {
// @Override
// public void execute() {
// Session session = SessionManager.getInstance().getSession(sessionId);
// if (session != null) {
// GameManager.getInstance().quitMatch(gameId, session.getUserId());
// } else{
// logger.error("Session not found sessionId: "+ sessionId + " gameId:" +gameId);
// }
// }
// });
// }
//
// @Override
// public void quitTournament(final UUID tournamentId, final String sessionId) throws MageException {
// execute("quitTournament", sessionId, new Action() {
// @Override
// public void execute() {
// Session session = SessionManager.getInstance().getSession(sessionId);
// if (session != null) {
// TournamentManager.getInstance().quit(tournamentId, session.getUserId());
// }else{
// logger.error("Session not found sessionId: "+ sessionId + " tournamentId:" + tournamentId);
// }
// }
// });
// }
//
// @Override
// public void quitDraft(final UUID draftId, final String sessionId) throws MageException {
// execute("quitDraft", sessionId, new Action() {
// @Override
// public void execute() {
// Session session = SessionManager.getInstance().getSession(sessionId);
// if (session == null) {
// logger.error("Session not found sessionId: "+ sessionId + " draftId:" + draftId);
// return;
// }
// UUID tableId = DraftManager.getInstance().getControllerByDraftId(draftId).getTableId();
// Table table = TableManager.getInstance().getTable(tableId);
// if (table.isTournament()) {
// UUID tournamentId = table.getTournament().getId();
// TournamentManager.getInstance().quit(tournamentId, session.getUserId());
// }
// }
// });
// }
@Override
public DraftPickView pickCard(final UUID draftId, final String sessionId, final UUID cardPick, final Set<UUID> hiddenCards) {
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null) {
return DraftManager.getInstance().sendCardPick(draftId, session.getUserId(), cardPick, hiddenCards);
} else{
logger.error("Session not found sessionId: "+ sessionId + " draftId:" + draftId);
}
return null;
}
@Override
public void markCard(final UUID draftId, final String sessionId, final UUID cardPick) {
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null) {
DraftManager.getInstance().sendCardMark(draftId, session.getUserId(), cardPick);
} else{
logger.error("Session not found sessionId: "+ sessionId + " draftId:" + draftId);
}
}
@Override
public void quitMatch(final UUID gameId, final String sessionId) {
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null) {
GameManager.getInstance().quitMatch(gameId, session.getUserId());
} else{
logger.error("Session not found sessionId: "+ sessionId + " gameId:" +gameId);
}
}
@Override
public void quitTournament(final UUID tournamentId, final String sessionId) {
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null) {
TournamentManager.getInstance().quit(tournamentId, session.getUserId());
}else{
logger.error("Session not found sessionId: "+ sessionId + " tournamentId:" + tournamentId);
}
}
@Override
public void quitDraft(final UUID draftId, final String sessionId) {
Session session = SessionManager.getInstance().getSession(sessionId);
if (session == null) {
logger.error("Session not found sessionId: "+ sessionId + " draftId:" + draftId);
return;
}
UUID tableId = DraftManager.getInstance().getControllerByDraftId(draftId).getTableId();
Table table = TableManager.getInstance().getTable(tableId);
if (table.isTournament()) {
UUID tournamentId = table.getTournament().getId();
TournamentManager.getInstance().quit(tournamentId, session.getUserId());
}
}
@Override
public void sendPlayerAction(final PlayerAction playerAction, final UUID gameId, final String sessionId, final Serializable data) {
@ -1278,10 +1220,6 @@ public class ServerMain implements MageServer {
server.draftUpdate(sessionId, draftId, draftView);
}
public void draftInform(String sessionId, UUID draftId, DraftView draftView, String message) {
server.draftInform(sessionId, draftId, draftView, message);
}
public void draftOver(String sessionId, UUID draftId) {
server.draftOver(sessionId, draftId);
}
@ -1298,25 +1236,25 @@ public class ServerMain implements MageServer {
server.construct(sessionId, tableId, deck, time);
}
public void startTournament(String sessionId, UUID tournamentId, UUID playerId) {
server.startTournament(sessionId, tournamentId, playerId);
public void tournamentStarted(String sessionId, UUID tournamentId, UUID playerId) {
server.tournamentStarted(sessionId, tournamentId, playerId);
}
public void showTournament(String sessionId, UUID tournamentId) {
server.showTournament(sessionId, tournamentId);
}
public void tournamentInit(String sessionId, UUID tournamentId, TournamentView tournamentView) {
server.tournamentInit(sessionId, tournamentId, tournamentView);
}
// public void tournamentInit(String sessionId, UUID tournamentId, TournamentView tournamentView) {
// server.tournamentInit(sessionId, tournamentId, tournamentView);
// }
public void tournamentUpdate(String sessionId, UUID tournamentId, TournamentView tournamentView) {
server.tournamentUpdate(sessionId, tournamentId, tournamentView);
}
public void tournamentOver(String sessionId, UUID tournamentId) {
server.tournamentOver(sessionId, tournamentId);
}
// public void tournamentUpdate(String sessionId, UUID tournamentId, TournamentView tournamentView) {
// server.tournamentUpdate(sessionId, tournamentId, tournamentView);
// }
//
// public void tournamentOver(String sessionId, UUID tournamentId) {
// server.tournamentOver(sessionId, tournamentId);
// }
public void showGameEndDialog(String sessionId, UUID gameId) {
server.showGameEndDialog(sessionId, gameId);

19
Mage.Server/src/main/java/mage/server/User.java
View file

@ -62,7 +62,6 @@ import mage.view.DraftView;
import mage.view.GameClientMessage;
import mage.view.GameEndView;
import mage.view.GameView;
import mage.view.TournamentView;
import mage.view.UserRequestMessage;
import org.apache.log4j.Logger;
import org.mage.network.messages.MessageType;
@ -288,25 +287,13 @@ public class User {
}
public void tournamentStarted(final UUID tournamentId, final UUID playerId) {
ServerMain.getInstance().startTournament(sessionId, tournamentId, playerId);
ServerMain.getInstance().tournamentStarted(sessionId, tournamentId, playerId);
}
public void showTournament(final UUID tournamentId) {
ServerMain.getInstance().showTournament(sessionId, tournamentId);
}
public void tournamentInit(UUID tournamentId, TournamentView tournamentView) {
ServerMain.getInstance().tournamentInit(sessionId, tournamentId, tournamentView);
}
public void tournamentUpdate(UUID tournamentId, TournamentView tournamentView) {
ServerMain.getInstance().tournamentUpdate(sessionId, tournamentId, tournamentView);
}
public void tournamentOver(UUID tournamentId, String message) {
ServerMain.getInstance().tournamentOver(sessionId, tournamentId);
}
public void showGameEndDialog(final UUID gameId) {
ServerMain.getInstance().showGameEndDialog(sessionId, gameId);
}
@ -323,10 +310,6 @@ public class User {
ServerMain.getInstance().draftUpdate(sessionId, draftId, draftView);
}
public void draftInform(UUID draftId, DraftView view, String message) {
ServerMain.getInstance().draftInform(sessionId, draftId, view, message);
}
public void draftOver(UUID draftId) {
ServerMain.getInstance().draftOver(sessionId, draftId);
}

11
Mage.Server/src/main/java/mage/server/draft/DraftSession.java
View file

@ -89,17 +89,6 @@ public class DraftSession {
}
}
// not used
//
public void inform(final String message) {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.draftInform(draft.getId(), getDraftView(), message);
}
}
}
public void draftOver() {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);

12
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
View file

@ -184,11 +184,6 @@ public class TournamentController {
logger.fatal("Tournament session not found - playerId:" + playerId + " tournamentId " + tournament.getId());
return;
}
if (!tournamentSession.init()) {
logger.fatal("Unable to initialize client userId: " + tournamentSession.userId + " tournamentId " + tournament.getId());
return;
}
tournamentSession.update();
}
private void checkStart() {
@ -216,13 +211,6 @@ public class TournamentController {
}
private synchronized void startTournament() {
for (final TournamentSession tournamentSession : tournamentSessions.values()) {
if (!tournamentSession.init()) {
logger.fatal("Unable to initialize client userId: " + tournamentSession.userId + " tournamentId " + tournament.getId());
//TODO: generate client error message
return;
}
}
started = true;
logger.debug("Tournament starts (all players joined): " + tournament.getId() + " - " + tournament.getTournamentType().toString());
tournament.nextStep();

38
Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java
View file

@ -28,6 +28,10 @@
package mage.server.tournament;
import java.util.UUID;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import mage.cards.decks.Deck;
import mage.game.tournament.Tournament;
import mage.server.User;
@ -36,11 +40,6 @@ import mage.server.util.ThreadExecutor;
import mage.view.TournamentView;
import org.apache.log4j.Logger;
import java.util.UUID;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
/**
*
* @author BetaSteward_at_googlemail.com
@ -64,35 +63,6 @@ public class TournamentSession {
this.tableId = tableId;
}
public boolean init() {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.tournamentInit(tournament.getId(), getTournamentView());
return true;
}
}
return false;
}
public void update() {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.tournamentUpdate(tournament.getId(), getTournamentView());
}
}
}
public void gameOver(final String message) {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.tournamentOver(tournament.getId(), message);
}
}
}
public void construct(int timeout) {
if (!killed) {
setupTimeout(timeout);