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

Merge branch '1577-znr-charm-effect-tweaks' into 'master'

Browse Source 
Resolve "ZNR: Charm Effect tweaks"

Closes #1562, #1570, and #1577

See merge request core-developers/forge!3197
This commit is contained in:
Michael Kamensky
2020-10-01 05:02:41 +00:00
parent 27b3850c27 daf70f7e60
commit b2adfd4a02
22 changed files with 237 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -446,7 +446,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num, boolean allowRepeat) {
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, List<AbilitySub> possible, int min, int num, boolean allowRepeat) {
throw new IllegalStateException("Erring on the side of caution here...");
}