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

Merge branch 'fixPhasingPW' into 'master'

Browse Source 
Fix Planeswalkers taking damage when phasing out during combat

Closes #1060

See merge request core-developers/forge!3667
This commit is contained in:
Michael Kamensky
2021-02-01 04:41:07 +00:00
parent 0bdded76bc 200849920a
commit 7ae0fbd082
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,6 +595,23 @@ public class Combat {
}
}
for (Card pw : getDefendingPlaneswalkers()) {
if (pw.equals(c)) {
Multimap<GameEntity, AttackingBand> attackerBuffer = ArrayListMultimap.create();
Collection<AttackingBand> bands = attackedByBands.get(pw);
for (AttackingBand abPW : bands) {
unregisterDefender(c, abPW);
// Rule 506.4c workaround to keep creatures in combat
Card fake = new Card(-1, c.getGame());
fake.setName("<Nothing>");
fake.setController(c.getController(), 0);
attackerBuffer.put(fake, abPW);
}
bands.clear();
attackedByBands.putAll(attackerBuffer);
}
}
// remove card from map
while (blockedBands.values().remove(c));
c.updateBlockingForView();