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

- Blockers with Trample should not open the AssignDamage dialog when there is only one creature it's blocking

Browse Source
This commit is contained in:
Sol
2013-04-15 03:18:56 +00:00
parent 56c2bff69f
commit d110c283ab
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -188,12 +188,14 @@ public class PlayerControllerHuman extends PlayerController {
*/ */
@Override @Override
public Map<Card, Integer> assignCombatDamage(Card attacker, List<Card> blockers, int damageDealt, GameEntity defender) { public Map<Card, Integer> assignCombatDamage(Card attacker, List<Card> blockers, int damageDealt, GameEntity defender) {
// Attacker is a poor name here, since the creature assigning damage
// could just as easily be the blocker.
Map<Card, Integer> map; Map<Card, Integer> map;
if (defender != null && assignDamageAsIfNotBlocked(attacker)) { if (defender != null && assignDamageAsIfNotBlocked(attacker)) {
map = new HashMap<Card, Integer>(); map = new HashMap<Card, Integer>();
map.put(null, damageDealt); map.put(null, damageDealt);
} else { } else {
if (attacker.hasKeyword("Trample") || (blockers.size() > 1)) { if ((attacker.hasKeyword("Trample") && defender != null) || (blockers.size() > 1)) {
map = CMatchUI.SINGLETON_INSTANCE.getDamageToAssign(attacker, blockers, damageDealt, defender); map = CMatchUI.SINGLETON_INSTANCE.getDamageToAssign(attacker, blockers, damageDealt, defender);
} else { } else {
map = new HashMap<Card, Integer>(); map = new HashMap<Card, Integer>();