Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Don't erase a permanent's attacking/blocking info when it leaves the battlefield. Kithkin Mourncaller and Kardur Doomscourge no longer need their own special TriggeredAbility class

Browse source
This commit is contained in:
Alex W. Jackson 2022-09-12 10:43:21 -04:00
parent 7c2f76b46b
commit c84d9d2168
8 changed files with 32 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -1447,7 +1447,7 @@ public class Combat implements Serializable, Copyable<Combat> {
}
}
public boolean removePlaneswalkerFromCombat(UUID planeswalkerId, Game game, boolean withInfo) {
public boolean removePlaneswalkerFromCombat(UUID planeswalkerId, Game game) {
boolean result = false;
for (CombatGroup group : groups) {
if (group.getDefenderId() != null && group.getDefenderId().equals(planeswalkerId)) {
@ -1458,13 +1458,14 @@ public class Combat implements Serializable, Copyable<Combat> {
return result;
}
public boolean removeFromCombat(UUID creatureId, Game game, boolean withInfo) {
public boolean removeFromCombat(UUID creatureId, Game game, boolean withEvent) {
boolean result = false;
Permanent creature = game.getPermanent(creatureId);
if (creature != null) {
creature.setAttacking(false);
creature.setBlocking(0);
creature.setRemovedFromCombat(true);
if (withEvent) {
creature.setAttacking(false);
creature.setBlocking(0);
}
for (CombatGroup group : groups) {
for (UUID attackerId : group.attackers) {
Permanent attacker = game.getPermanent(attackerId);
@ -1479,7 +1480,7 @@ public class Combat implements Serializable, Copyable<Combat> {
}
creature.clearBandedCards();
blockingGroups.remove(creatureId);
if (result && withInfo) {
if (result && withEvent) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.REMOVED_FROM_COMBAT, creatureId, null, null));
game.informPlayers(creature.getLogName() + " removed from combat");
}
@ -1507,10 +1508,6 @@ public class Combat implements Serializable, Copyable<Combat> {
}
}
}
// reset the removeFromCombat flag on all creatures on the battlefield
for (Permanent creaturePermanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, game)) {
creaturePermanent.setRemovedFromCombat(false);
}
clear();
}