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

Merge branch 'blockfix' into 'master'

Browse Source 
Fix onlyOneBlockerPerOpponent

See merge request core-developers/forge!5200
This commit is contained in:
Michael Kamensky
2021-08-08 16:48:24 +00:00
parent 0b08b15617 e5f53febf8
commit 76e7bb9530
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,7 +425,9 @@ public class CombatUtil {
return false; return false;
} }
final int blockersFromOnePlayer = CardLists.filter(combat.getAllBlockers(), CardPredicates.isController(blocker.getController())).size(); CardCollection allOtherBlockers = combat.getAllBlockers();
allOtherBlockers.remove(blocker);
final int blockersFromOnePlayer = CardLists.filter(allOtherBlockers, CardPredicates.isController(blocker.getController())).size();
if (blockersFromOnePlayer > 0 && game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.onlyOneBlockerPerOpponent)) { if (blockersFromOnePlayer > 0 && game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.onlyOneBlockerPerOpponent)) {
return false; return false;
} }