external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support actually starting a match again

Browse Source
This commit is contained in:
drdev
2014-04-11 15:36:35 +00:00
parent be8acb8333
commit 0ebe9fb7e6
8 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/GameRules.java
View File

@@ -1,7 +1,7 @@
package forge.game;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
public class GameRules {
private GameType gameType;
@@ -66,7 +66,7 @@ public class GameRules {
return gamesToWinMatch;
}
public void setAppliedVariants(List<GameType> appliedVariants) {
public void setAppliedVariants(Set<GameType> appliedVariants) {
this.appliedVariants.addAll(appliedVariants);
}

3
forge-game/src/main/java/forge/game/player/RegisteredPlayer.java
View File

@@ -9,6 +9,7 @@ import forge.item.PaperCard;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
public class RegisteredPlayer {
@@ -115,7 +116,7 @@ public class RegisteredPlayer {
}
public static RegisteredPlayer forVariants(
final List<GameType> appliedVariants, final Deck deck, //General vars
final Set<GameType> appliedVariants, final Deck deck, //General vars
final Iterable<PaperCard> schemes, final boolean playerIsArchenemy, //Archenemy specific vars
final Iterable<PaperCard> planes, final PaperCard vanguardAvatar) { //Planechase and Vanguard