External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

spjspj - Update to push deck List across from Client to Server for Custom Cube

Browse source
This commit is contained in:
spjspj 2016-07-25 22:44:21 +10:00
parent 9d9265e02b
commit 883b63a01d
5 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import java.lang.reflect.Constructor;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import mage.cards.decks.Deck;
import mage.game.draft.DraftCube;
import org.apache.log4j.Logger;
@ -67,13 +68,13 @@ public class CubeFactory {
return draftCube;
}
public DraftCube createDeckDraftCube(String draftCubeName, String chosenDckFile) {
public DraftCube createDeckDraftCube(String draftCubeName, Deck cubeFromDeck) {
DraftCube draftCube;
Constructor<?> con;
try {
con = draftCubes.get(draftCubeName).getConstructor(new Class[]{String.class});
draftCube = (DraftCube)con.newInstance(new Object[] {chosenDckFile});
con = draftCubes.get(draftCubeName).getConstructor(new Class[]{Deck.class});
draftCube = (DraftCube)con.newInstance(new Object[] {cubeFromDeck});
} catch (Exception ex) {
logger.fatal("CubeFactory error", ex);
return null;

4
Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java
View file

@ -81,8 +81,8 @@ public class TournamentFactory {
if (tournament.getTournamentType().isCubeBooster()) {
DraftCube draftCube = null;
if (tournament.getOptions().getLimitedOptions().getCubeFromDeckFilename().length() != 0) {
draftCube = CubeFactory.getInstance().createDeckDraftCube(tournament.getOptions().getLimitedOptions().getDraftCubeName(), tournament.getOptions().getLimitedOptions().getCubeFromDeckFilename());
if (tournament.getOptions().getLimitedOptions().getCubeFromDeck() != null) {
draftCube = CubeFactory.getInstance().createDeckDraftCube(tournament.getOptions().getLimitedOptions().getDraftCubeName(), tournament.getOptions().getLimitedOptions().getCubeFromDeck());
} else {
draftCube = CubeFactory.getInstance().createDraftCube(tournament.getOptions().getLimitedOptions().getDraftCubeName());
}