External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

and more refactoring

Browse source
This commit is contained in:
betasteward 2015-07-02 09:08:56 -04:00
parent 27da366eea
commit 1ff7f4ba5c
7 changed files with 237 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,13 +74,12 @@ import mage.view.CardsView;
import mage.view.ChatMessage;
import mage.view.ChatMessage.MessageColor;
import mage.view.DeckView;
import mage.view.DraftClientMessage;
import mage.view.DraftPickView;
import mage.view.DraftView;
import mage.view.GameClientMessage;
import mage.view.GameEndView;
import mage.view.GameView;
import mage.view.RoomView;
import mage.view.TableClientMessage;
import mage.view.TableView;
import mage.view.TournamentView;
import mage.view.UserDataView;
@ -1267,28 +1266,28 @@ public class ServerMain implements MageServer {
server.gameError(sessionId, gameId, message);
}
public void startDraft(String sessionId, UUID draftId, TableClientMessage tableClientMessage) {
server.startDraft(sessionId, draftId, tableClientMessage);
public void startDraft(String sessionId, UUID draftId, UUID playerId) {
server.startDraft(sessionId, draftId, playerId);
}
public void draftInit(String sessionId, UUID draftId, DraftClientMessage draftClientMessage) {
server.draftInit(sessionId, draftId, draftClientMessage);
public void draftInit(String sessionId, UUID draftId, DraftPickView draftPickView) {
server.draftInit(sessionId, draftId, draftPickView);
}
public void draftUpdate(String sessionId, UUID draftId, DraftView draftView) {
server.draftUpdate(sessionId, draftId, draftView);
}
public void draftInform(String sessionId, UUID draftId, DraftClientMessage draftClientMessage) {
server.draftInform(sessionId, draftId, draftClientMessage);
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);
}
public void draftPick(String sessionId, UUID draftId, DraftClientMessage draftClientMessage) {
server.draftPick(sessionId, draftId, draftClientMessage);
public void draftPick(String sessionId, UUID draftId, DraftPickView draftPickView) {
server.draftPick(sessionId, draftId, draftPickView);
}
public void sideboard(String sessionId, UUID tableId, DeckView deck, int time, boolean limited) {
@ -1299,8 +1298,8 @@ public class ServerMain implements MageServer {
server.construct(sessionId, tableId, deck, time);
}
public void startTournament(String sessionId, UUID tournamentId, TableClientMessage tableClientMessage) {
server.startTournament(sessionId, tournamentId, tableClientMessage);
public void startTournament(String sessionId, UUID tournamentId, UUID playerId) {
server.startTournament(sessionId, tournamentId, playerId);
}
public void showTournament(String sessionId, UUID tournamentId) {

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

@ -57,12 +57,11 @@ import mage.view.AbilityPickerView;
import mage.view.CardsView;
import mage.view.ChatMessage;
import mage.view.DeckView;
import mage.view.DraftClientMessage;
import mage.view.DraftPickView;
import mage.view.DraftView;
import mage.view.GameClientMessage;
import mage.view.GameEndView;
import mage.view.GameView;
import mage.view.TableClientMessage;
import mage.view.TournamentView;
import mage.view.UserRequestMessage;
import org.apache.log4j.Logger;
@ -289,7 +288,7 @@ public class User {
}
public void tournamentStarted(final UUID tournamentId, final UUID playerId) {
ServerMain.getInstance().startTournament(sessionId, tournamentId, new TableClientMessage(tournamentId, playerId));
ServerMain.getInstance().startTournament(sessionId, tournamentId, playerId);
}
public void showTournament(final UUID tournamentId) {
@ -313,27 +312,27 @@ public class User {
}
public void draftStarted(final UUID draftId, final UUID playerId) {
ServerMain.getInstance().startDraft(sessionId, draftId, new TableClientMessage(draftId, playerId));
ServerMain.getInstance().startDraft(sessionId, draftId, playerId);
}
public void draftInit(UUID draftId, DraftClientMessage draftClientMessage) {
ServerMain.getInstance().draftInit(sessionId, draftId, draftClientMessage);
public void draftInit(UUID draftId, DraftPickView view) {
ServerMain.getInstance().draftInit(sessionId, draftId, view);
}
public void draftUpdate(UUID draftId, DraftView draftView) {
ServerMain.getInstance().draftUpdate(sessionId, draftId, draftView);
}
public void draftInform(UUID draftId, DraftClientMessage draftClientMessage) {
ServerMain.getInstance().draftInform(sessionId, draftId, draftClientMessage);
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);
}
public void draftPick(UUID draftId, DraftClientMessage draftClientMessage) {
ServerMain.getInstance().draftPick(sessionId, draftId, draftClientMessage);
public void draftPick(UUID draftId, DraftPickView view) {
ServerMain.getInstance().draftPick(sessionId, draftId, view);
}
public void chatMessage(UUID chatId, ChatMessage chatMessage) {

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

@ -38,7 +38,6 @@ import mage.game.draft.Draft;
import mage.server.User;
import mage.server.UserManager;
import mage.server.util.ThreadExecutor;
import mage.view.DraftClientMessage;
import mage.view.DraftPickView;
import mage.view.DraftView;
import org.apache.log4j.Logger;
@ -73,7 +72,7 @@ public class DraftSession {
if (user != null) {
if (futureTimeout != null && !futureTimeout.isDone()) {
int remaining = (int) futureTimeout.getDelay(TimeUnit.SECONDS);
user.draftInit(draft.getId(), new DraftClientMessage(getDraftPickView(remaining)));
user.draftInit(draft.getId(), getDraftPickView(remaining));
}
return true;
}
@ -96,7 +95,7 @@ public class DraftSession {
if (!killed) {
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.draftInform(draft.getId(), new DraftClientMessage(getDraftView(), message));
user.draftInform(draft.getId(), getDraftView(), message);
}
}
}
@ -115,7 +114,7 @@ public class DraftSession {
setupTimeout(timeout);
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
user.draftPick(draft.getId(), new DraftClientMessage(getDraftPickView(timeout)));
user.draftPick(draft.getId(), getDraftPickView(timeout));
}
}
}