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 'thrasta' into 'master'

Browse Source 
MH2: Thrasta and "Trample over planeswalkers"

See merge request core-developers/forge!4824
This commit is contained in:
Michael Kamensky
2021-06-05 03:17:27 +00:00
parent 76ee1e776f 2364e8dd26
commit f53e4495de
7 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -356,8 +356,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
map.put(null, damageDealt);
} else {
if ((attacker.hasKeyword(Keyword.TRAMPLE) && defender != null) || (blockers.size() > 1)
|| (attacker.hasKeyword("You may assign CARDNAME's combat damage divided as you choose among defending" +
" player and/or any number of creatures they control.")) && overrideOrder && blockers.size() >0) {
|| ((attacker.hasKeyword("You may assign CARDNAME's combat damage divided as you choose among " +
"defending player and/or any number of creatures they control.")) && overrideOrder &&
blockers.size() >0) || (attacker.hasKeyword("Trample over planeswalkers") && defender instanceof Card)) {
GameEntityViewMap<Card, CardView> gameCacheBlockers = GameEntityView.getMap(blockers);
final CardView vAttacker = CardView.get(attacker);
final GameEntityView vDefender = GameEntityView.get(defender);