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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
CCTV-1
2020-03-20 11:07:17 +08:00
parent 1a99afa99e dafd2e6a2a
commit 5005cf9102
53 changed files with 550 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/config/forge.command
View File

@@ -1,3 +0,0 @@
#!/bin/sh
cd "`dirname \"$0\"`"
java -Xmx1024m -jar $project.build.finalName$

3
forge-gui/src/main/config/forge.sh
View File

@@ -1,3 +0,0 @@
#!/bin/sh
cd "`dirname \"$0\"`"
java -Xmx1024m -jar $project.build.finalName$

6
forge-gui/src/main/java/forge/deck/DeckgenUtil.java
View File

@@ -156,6 +156,9 @@ public class DeckgenUtil {
//}
}
//remove any cards not valid in format
selectedCards = Lists.newArrayList(Iterables.filter(selectedCards, format.getFilterPrinted()));
List<PaperCard> toRemove = new ArrayList<>();
//randomly remove cards
@@ -252,6 +255,9 @@ public class DeckgenUtil {
//}
}
//remove any cards not valid in format
selectedCards = Lists.newArrayList(Iterables.filter(selectedCards, format.getFilterPrinted()));
List<PaperCard> toRemove = new ArrayList<>();
//randomly remove cards

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1181,7 +1181,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public Object vote(final SpellAbility sa, final String prompt, final List<Object> options,
final ListMultimap<Object, Player> votes) {
final ListMultimap<Object, Player> votes, Player forPlayer) {
return getGui().one(prompt, options);
}