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

Merge branch 'newBranch' into 'master'

Browse Source 
Fix declare attackers

Closes #1205

See merge request core-developers/forge!2288
This commit is contained in:
Hans Mackowiak
2019-11-18 04:19:10 +00:00
parent 6c38674716 5069c71dd8
commit dffb63d95f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -70,7 +70,7 @@ public class Combat {
public Combat(final Player attacker) { public Combat(final Player attacker) {
playerWhoAttacks = attacker; playerWhoAttacks = attacker;
initConstraints();
} }
public Combat(Combat combat, GameObjectMap map) { public Combat(Combat combat, GameObjectMap map) {
@@ -116,9 +116,9 @@ public class Combat {
} }
public void initConstraints() { public void initConstraints() {
attackableEntries.clear();
// Create keys for all possible attack targets // Create keys for all possible attack targets
attackableEntries.addAll(CombatUtil.getAllPossibleDefenders(playerWhoAttacks)); attackableEntries.addAll(CombatUtil.getAllPossibleDefenders(playerWhoAttacks));
attackConstraints = new AttackConstraints(this); attackConstraints = new AttackConstraints(this);
} }