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

Fix not being able to freely divide combat damage to attackers (#8961)

Browse Source
This commit is contained in:
tool4ever
2025-10-19 22:50:57 +02:00
committed by GitHub
parent 6f38479190
commit 7367e93140
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -2051,7 +2051,7 @@ public class ComputerUtilCombat {
} }
// Order the combatants in preferred order in case legacy ordering is disabled // Order the combatants in preferred order in case legacy ordering is disabled
if (!self.getGame().getRules().hasOrderCombatants()) { if (!overrideOrder) {
if (combatant.isAttacking()) { if (combatant.isAttacking()) {
opposedCombatants = AiBlockController.orderBlockers(combatant, new CardCollection(opposedCombatants)); opposedCombatants = AiBlockController.orderBlockers(combatant, new CardCollection(opposedCombatants));
} else { } else {

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

@@ -744,7 +744,7 @@ public class Combat {
assigningPlayer = attackingPlayer; assigningPlayer = attackingPlayer;
assignedDamage = true; assignedDamage = true;
Map<Card, Integer> map = assigningPlayer.getController().assignCombatDamage(blocker, attackers, null, damage, defender, divideCombatDamageAsChoose || assigningPlayer != blocker.getController()); Map<Card, Integer> map = assigningPlayer.getController().assignCombatDamage(blocker, attackers, null, damage, defender, divideCombatDamageAsChoose || assigningPlayer != blocker.getController() || !this.legacyOrderCombatants);
for (Entry<Card, Integer> dt : map.entrySet()) { for (Entry<Card, Integer> dt : map.entrySet()) {
// Butcher Orgg // Butcher Orgg
if (dt.getKey() == null && dt.getValue() > 0) { if (dt.getKey() == null && dt.getValue() > 0) {