From eb0366998992ff13bfba2c62a09354c35a5e4fe7 Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 02:23:57 +0000
Subject: [PATCH] Fixed creatures that must attack being forced to attack
players that have already lost the game
---
Mage/src/main/java/mage/game/combat/Combat.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java
index 353c9c9f70..80821c23fc 100644
--- a/Mage/src/main/java/mage/game/combat/Combat.java
+++ b/Mage/src/main/java/mage/game/combat/Combat.java
@@ -451,8 +451,14 @@ public class Combat implements Serializable, Copyable<Combat> {
mustAttack = true;
for (Ability ability : entry.getValue()) {
UUID defenderId = effect.mustAttackDefender(ability, game);
- if (defenderId != null && defenders.contains(defenderId)) {
- defendersForcedToAttack.add(defenderId);
+
+ if (defenderId != null) {
+ // creature is not forced to attack players that are no longer in the game
+ if (game.getPermanentOrLKIBattlefield(defenderId) == null && game.getPlayer(defenderId).hasLost()) {
+ return;
+ } else if (defenders.contains(defenderId)) {
+ defendersForcedToAttack.add(defenderId);
+ }
}
break;
}