Merge branch 'newBranch' into 'master'

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

View File

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